From 0b2a4eb4bd603a62f4f3eb88def0113cc93e18d9 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 29 Aug 2017 15:08:38 -0600 Subject: [PATCH] Networking: A little more wording changes related to interrupts vs. events --- net/arp/arp.h | 4 ++-- net/icmp/icmp_input.c | 2 +- net/icmp/icmp_ping.c | 2 +- net/icmp/icmp_poll.c | 2 +- net/icmp/icmp_send.c | 2 +- net/icmpv6/icmpv6.h | 4 ++-- net/icmpv6/icmpv6_input.c | 2 +- net/icmpv6/icmpv6_ping.c | 4 ++-- net/icmpv6/icmpv6_poll.c | 2 +- net/ieee802154/ieee802154_poll.c | 2 +- net/igmp/igmp.h | 2 +- net/igmp/igmp_send.c | 2 +- net/inet/inet_close.c | 2 +- net/inet/inet_recvfrom.c | 2 +- net/pkt/pkt_conn.c | 4 ++-- net/pkt/pkt_input.c | 2 +- net/pkt/pkt_poll.c | 2 +- net/tcp/tcp_accept.c | 4 ++-- net/tcp/tcp_appsend.c | 4 ++-- net/tcp/tcp_conn.c | 10 +++++----- net/tcp/tcp_input.c | 2 +- net/tcp/tcp_netpoll.c | 2 +- net/tcp/tcp_send_buffered.c | 8 ++++---- net/tcp/tcp_sendfile.c | 6 +++--- net/tcp/tcp_timer.c | 2 +- net/udp/udp_conn.c | 8 ++++---- net/udp/udp_devpoll.c | 2 +- net/udp/udp_input.c | 2 +- net/udp/udp_netpoll.c | 2 +- net/udp/udp_send.c | 2 +- 30 files changed, 48 insertions(+), 48 deletions(-) diff --git a/net/arp/arp.h b/net/arp/arp.h index 7c09294022..0fbea68c51 100644 --- a/net/arp/arp.h +++ b/net/arp/arp.h @@ -378,8 +378,8 @@ void arp_notify(in_addr_t ipaddr); * ipaddr - Refers to an IP address in network order * * Assumptions - * Interrupts are disabled; Returned value will become unstable when - * interrupts are re-enabled or if any other network APIs are called. + * The network is locked; Returned value will become unstable when the + * network is unlocked or if any other network APIs are called. * ****************************************************************************/ diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c index ff822e493a..53758ab53e 100644 --- a/net/icmp/icmp_input.c +++ b/net/icmp/icmp_input.c @@ -86,7 +86,7 @@ * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c index 35cae0caf5..fbf781a211 100644 --- a/net/icmp/icmp_ping.c +++ b/net/icmp/icmp_ping.c @@ -111,7 +111,7 @@ struct icmp_ping_s * TRUE:timeout FALSE:no timeout * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ diff --git a/net/icmp/icmp_poll.c b/net/icmp/icmp_poll.c index 9a5eed1d08..1075fbbe55 100644 --- a/net/icmp/icmp_poll.c +++ b/net/icmp/icmp_poll.c @@ -66,7 +66,7 @@ * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/icmp/icmp_send.c b/net/icmp/icmp_send.c index d8216378eb..38d737db8a 100644 --- a/net/icmp/icmp_send.c +++ b/net/icmp/icmp_send.c @@ -77,7 +77,7 @@ * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/icmpv6/icmpv6.h b/net/icmpv6/icmpv6.h index 866ab3bc1d..2b2c2380db 100644 --- a/net/icmpv6/icmpv6.h +++ b/net/icmpv6/icmpv6.h @@ -133,7 +133,7 @@ struct net_driver_s; /* Forward reference */ * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ @@ -189,7 +189,7 @@ int icmpv6_neighbor(const net_ipv6addr_t ipaddr); * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/icmpv6/icmpv6_input.c b/net/icmpv6/icmpv6_input.c index a2f229627d..cc2af0533a 100644 --- a/net/icmpv6/icmpv6_input.c +++ b/net/icmpv6/icmpv6_input.c @@ -92,7 +92,7 @@ * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/icmpv6/icmpv6_ping.c b/net/icmpv6/icmpv6_ping.c index 017708fffb..43427f3cc6 100644 --- a/net/icmpv6/icmpv6_ping.c +++ b/net/icmpv6/icmpv6_ping.c @@ -123,7 +123,7 @@ struct icmpv6_ping_s * TRUE:timeout FALSE:no timeout * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ @@ -246,7 +246,7 @@ static void icmpv6_echo_request(FAR struct net_driver_s *dev, * Modified value of the input flags * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ diff --git a/net/icmpv6/icmpv6_poll.c b/net/icmpv6/icmpv6_poll.c index 6cf00532fb..10b7beca0d 100644 --- a/net/icmpv6/icmpv6_poll.c +++ b/net/icmpv6/icmpv6_poll.c @@ -83,7 +83,7 @@ * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/ieee802154/ieee802154_poll.c b/net/ieee802154/ieee802154_poll.c index f46f6611b4..0d313e0e4b 100644 --- a/net/ieee802154/ieee802154_poll.c +++ b/net/ieee802154/ieee802154_poll.c @@ -68,7 +68,7 @@ * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/igmp/igmp.h b/net/igmp/igmp.h index 5af1594a2e..bf46fe1897 100644 --- a/net/igmp/igmp.h +++ b/net/igmp/igmp.h @@ -295,7 +295,7 @@ void igmp_poll(FAR struct net_driver_s *dev); * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/igmp/igmp_send.c b/net/igmp/igmp_send.c index fb91636f46..0224e2b29d 100644 --- a/net/igmp/igmp_send.c +++ b/net/igmp/igmp_send.c @@ -110,7 +110,7 @@ static uint16_t igmp_chksum(FAR uint8_t *buffer, int buflen) * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/inet/inet_close.c b/net/inet/inet_close.c index a9f01e4952..12f6b44896 100644 --- a/net/inet/inet_close.c +++ b/net/inet/inet_close.c @@ -104,7 +104,7 @@ struct tcp_close_s * TRUE:timeout FALSE:no timeout * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ diff --git a/net/inet/inet_recvfrom.c b/net/inet/inet_recvfrom.c index 02dfa32842..0adc679529 100644 --- a/net/inet/inet_recvfrom.c +++ b/net/inet/inet_recvfrom.c @@ -551,7 +551,7 @@ static int inet_recvfrom_timeout(struct inet_recvfrom_s *pstate) * None * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ diff --git a/net/pkt/pkt_conn.c b/net/pkt/pkt_conn.c index 4002c29d3a..599fe63371 100644 --- a/net/pkt/pkt_conn.c +++ b/net/pkt/pkt_conn.c @@ -206,7 +206,7 @@ void pkt_free(FAR struct pkt_conn_s *conn) * connection to be used with the provided Ethernet header * * Assumptions: - * This function is called from UIP logic at interrupt level + * This function is called from network logic at interrupt level * ****************************************************************************/ @@ -246,7 +246,7 @@ FAR struct pkt_conn_s *pkt_active(struct eth_hdr_s *buf) * Traverse the list of allocated packet connections * * Assumptions: - * This function is called from UIP logic at interrupt level (or with + * This function is called from network logic at interrupt level (or with * interrupts disabled). * ****************************************************************************/ diff --git a/net/pkt/pkt_input.c b/net/pkt/pkt_input.c index 1c69e0b559..e4ba86c2d1 100644 --- a/net/pkt/pkt_input.c +++ b/net/pkt/pkt_input.c @@ -80,7 +80,7 @@ * place. * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/pkt/pkt_poll.c b/net/pkt/pkt_poll.c index a39772022e..272de209f3 100644 --- a/net/pkt/pkt_poll.c +++ b/net/pkt/pkt_poll.c @@ -72,7 +72,7 @@ * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/tcp/tcp_accept.c b/net/tcp/tcp_accept.c index 1c8cd55125..cf8ceb618d 100644 --- a/net/tcp/tcp_accept.c +++ b/net/tcp/tcp_accept.c @@ -88,7 +88,7 @@ struct accept_s * None * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ @@ -158,7 +158,7 @@ static inline void accept_tcpsender(FAR struct socket *psock, * None * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ diff --git a/net/tcp/tcp_appsend.c b/net/tcp/tcp_appsend.c index e638bf18b7..7ee1f06779 100644 --- a/net/tcp/tcp_appsend.c +++ b/net/tcp/tcp_appsend.c @@ -76,7 +76,7 @@ * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ @@ -201,7 +201,7 @@ void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c index e7df27fd46..1dd2f269d5 100644 --- a/net/tcp/tcp_conn.c +++ b/net/tcp/tcp_conn.c @@ -312,7 +312,7 @@ static int tcp_selectport(uint8_t domain, FAR const union ip_addr_u *ipaddr, * connection to be used with the provided TCP/IP header * * Assumptions: - * This function is called from UIP logic at interrupt level + * This function is called from network logic at interrupt level * ****************************************************************************/ @@ -379,7 +379,7 @@ static inline FAR struct tcp_conn_s * * connection to be used with the provided TCP/IP header * * Assumptions: - * This function is called from UIP logic at interrupt level + * This function is called from network logic at interrupt level * ****************************************************************************/ @@ -819,7 +819,7 @@ void tcp_free(FAR struct tcp_conn_s *conn) * connection to be used with the provided TCP/IP header * * Assumptions: - * This function is called from UIP logic at interrupt level + * This function is called from network logic at interrupt level * ****************************************************************************/ @@ -852,7 +852,7 @@ FAR struct tcp_conn_s *tcp_active(FAR struct net_driver_s *dev, * Traverse the list of active TCP connections * * Assumptions: - * This function is called from UIP logic at interrupt level (or with + * This function is called from network logic at interrupt level (or with * interrupts disabled). * ****************************************************************************/ @@ -878,7 +878,7 @@ FAR struct tcp_conn_s *tcp_nextconn(FAR struct tcp_conn_s *conn) * a new connection and initialize it to send a SYNACK in return. * * Assumptions: - * This function is called from UIP logic at interrupt level + * This function is called from network logic at interrupt level * ****************************************************************************/ diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c index 76fecdfd7e..b78a819fc0 100644 --- a/net/tcp/tcp_input.c +++ b/net/tcp/tcp_input.c @@ -80,7 +80,7 @@ * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/tcp/tcp_netpoll.c b/net/tcp/tcp_netpoll.c index 3c5ff4f5a5..19ca598b61 100644 --- a/net/tcp/tcp_netpoll.c +++ b/net/tcp/tcp_netpoll.c @@ -85,7 +85,7 @@ struct tcp_poll_s * None * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c index 074822e808..b15e132955 100644 --- a/net/tcp/tcp_send_buffered.c +++ b/net/tcp/tcp_send_buffered.c @@ -121,7 +121,7 @@ * None * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ @@ -223,7 +223,7 @@ static inline void psock_lost_connection(FAR struct socket *psock, * None * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ @@ -275,7 +275,7 @@ static inline void send_ipselect(FAR struct net_driver_s *dev, * the network device is not Ethernet). * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ @@ -336,7 +336,7 @@ static inline bool psock_send_addrchck(FAR struct tcp_conn_s *conn) * None * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ diff --git a/net/tcp/tcp_sendfile.c b/net/tcp/tcp_sendfile.c index 6cb809eb0f..da2108c99d 100644 --- a/net/tcp/tcp_sendfile.c +++ b/net/tcp/tcp_sendfile.c @@ -127,7 +127,7 @@ struct sendfile_s * TRUE:timeout FALSE:no timeout * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ @@ -269,7 +269,7 @@ static uint16_t ack_eventhandler(FAR struct net_driver_s *dev, * None * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ @@ -323,7 +323,7 @@ static inline bool sendfile_addrcheck(FAR struct tcp_conn_s *conn) * None * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ diff --git a/net/tcp/tcp_timer.c b/net/tcp/tcp_timer.c index eb01092bde..b5f5ffb5ab 100644 --- a/net/tcp/tcp_timer.c +++ b/net/tcp/tcp_timer.c @@ -76,7 +76,7 @@ * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/udp/udp_conn.c b/net/udp/udp_conn.c index 66b5c011a7..0407f67e24 100644 --- a/net/udp/udp_conn.c +++ b/net/udp/udp_conn.c @@ -245,7 +245,7 @@ static uint16_t udp_select_port(uint8_t domain, FAR union ip_binding_u *u) * used within the provided UDP header * * Assumptions: - * This function is called from UIP logic at interrupt level + * This function is called from network logic at interrupt level * ****************************************************************************/ @@ -337,7 +337,7 @@ static inline FAR struct udp_conn_s * * used within the provided UDP header * * Assumptions: - * This function is called from UIP logic at interrupt level + * This function is called from network logic at interrupt level * ****************************************************************************/ @@ -534,7 +534,7 @@ void udp_free(FAR struct udp_conn_s *conn) * connection to be used within the provided UDP header * * Assumptions: - * This function is called from UIP logic at interrupt level + * This function is called from network logic at interrupt level * ****************************************************************************/ @@ -567,7 +567,7 @@ FAR struct udp_conn_s *udp_active(FAR struct net_driver_s *dev, * Traverse the list of allocated UDP connections * * Assumptions: - * This function is called from UIP logic at interrupt level (or with + * This function is called from network logic at interrupt level (or with * interrupts disabled). * ****************************************************************************/ diff --git a/net/udp/udp_devpoll.c b/net/udp/udp_devpoll.c index 22962173db..9b6de1a0a0 100644 --- a/net/udp/udp_devpoll.c +++ b/net/udp/udp_devpoll.c @@ -72,7 +72,7 @@ * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/udp/udp_input.c b/net/udp/udp_input.c index e28e46b5d6..081dc26b06 100644 --- a/net/udp/udp_input.c +++ b/net/udp/udp_input.c @@ -79,7 +79,7 @@ * no outgoing data. * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/ diff --git a/net/udp/udp_netpoll.c b/net/udp/udp_netpoll.c index 868de13320..3f74901e60 100644 --- a/net/udp/udp_netpoll.c +++ b/net/udp/udp_netpoll.c @@ -84,7 +84,7 @@ struct udp_poll_s * None * * Assumptions: - * Running at the interrupt level + * The network is locked * ****************************************************************************/ diff --git a/net/udp/udp_send.c b/net/udp/udp_send.c index a29b1b239b..7779d03875 100644 --- a/net/udp/udp_send.c +++ b/net/udp/udp_send.c @@ -93,7 +93,7 @@ * None * * Assumptions: - * Called from the interrupt level or with interrupts disabled. + * The network is locked. * ****************************************************************************/