You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2026/01/01 16:04:23 UTC

(nuttx) branch master updated (eb5c8f4e9c5 -> 2f3b8255e02)

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


    from eb5c8f4e9c5 net/netlink: replace net_lock with netlink_lock
     new d377f6b7883 net: use netdev_lock to protect netdev_txnotify_dev
     new a0b847bf1b1 net/devif_callback: change flags type from uint16_t to uint32_t
     new c481374fb8d devif_poll: only call the corresponding xxx_poll when there is data to be sent
     new 2f3b8255e02 devif_poll.c: inline the small or single caller function

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 include/nuttx/net/netdev.h           |   4 +
 net/arp/arp_send.c                   |  14 +-
 net/arp/arp_table.c                  |   2 +-
 net/bluetooth/bluetooth.h            |   6 +-
 net/bluetooth/bluetooth_callback.c   |   8 +-
 net/bluetooth/bluetooth_recvmsg.c    |   8 +-
 net/bluetooth/bluetooth_sendmsg.c    |  12 +-
 net/can/can.h                        |   4 +-
 net/can/can_callback.c               |  10 +-
 net/can/can_input.c                  |   2 +-
 net/can/can_recvmsg.c                |   4 +-
 net/can/can_sendmsg.c                |   9 +-
 net/can/can_sendmsg_buffered.c       |  22 ++-
 net/can/can_sockif.c                 |   4 +-
 net/devif/devif.h                    |  89 +++++++-----
 net/devif/devif_callback.c           |  29 +---
 net/devif/devif_poll.c               | 256 +++++++++++++++++++----------------
 net/icmp/icmp_netpoll.c              |   6 +-
 net/icmp/icmp_recvmsg.c              |   6 +-
 net/icmp/icmp_sendmsg.c              |  10 +-
 net/icmpv6/icmpv6_autoconfig.c       |  10 +-
 net/icmpv6/icmpv6_neighbor.c         |  12 +-
 net/icmpv6/icmpv6_netpoll.c          |   6 +-
 net/icmpv6/icmpv6_recvmsg.c          |   6 +-
 net/icmpv6/icmpv6_sendmsg.c          |  14 +-
 net/ieee802154/ieee802154.h          |   4 +-
 net/ieee802154/ieee802154_callback.c |   6 +-
 net/ieee802154/ieee802154_recvmsg.c  |   8 +-
 net/ieee802154/ieee802154_sendmsg.c  |  10 +-
 net/igmp/igmp_msg.c                  |   4 +-
 net/igmp/igmp_timer.c                |   3 -
 net/ipforward/ipfwd_forward.c        |  10 +-
 net/ipforward/ipfwd_poll.c           |   4 +-
 net/ipfrag/ipfrag.c                  |   2 +-
 net/ipfrag/ipv4_frag.c               |   2 +-
 net/ipfrag/ipv6_frag.c               |   2 +-
 net/mld/mld_msg.c                    |   4 +-
 net/mld/mld_timer.c                  |  18 ++-
 net/netdev/netdev.h                  |  21 +--
 net/netdev/netdev_register.c         |   2 +
 net/netdev/netdev_txnotify.c         |  16 ++-
 net/pkt/pkt.h                        |   4 +-
 net/pkt/pkt_callback.c               |   6 +-
 net/pkt/pkt_input.c                  |   2 +-
 net/pkt/pkt_netpoll.c                |   6 +-
 net/pkt/pkt_recvmsg.c                |   6 +-
 net/pkt/pkt_sendmsg_buffered.c       |  10 +-
 net/pkt/pkt_sendmsg_unbuffered.c     |  11 +-
 net/sixlowpan/sixlowpan_send.c       |  14 +-
 net/sixlowpan/sixlowpan_tcpsend.c    |  10 +-
 net/tcp/tcp.h                        |  12 +-
 net/tcp/tcp_callback.c               |  16 +--
 net/tcp/tcp_close.c                  |   6 +-
 net/tcp/tcp_connect.c                |  28 ++--
 net/tcp/tcp_dump.c                   |   6 +-
 net/tcp/tcp_input.c                  |   2 +-
 net/tcp/tcp_monitor.c                |  21 +--
 net/tcp/tcp_netpoll.c                |   6 +-
 net/tcp/tcp_recvfrom.c               |  14 +-
 net/tcp/tcp_send.c                   |   4 +-
 net/tcp/tcp_send_buffered.c          |  17 ++-
 net/tcp/tcp_send_unbuffered.c        |  14 +-
 net/tcp/tcp_sendfile.c               |  16 +--
 net/tcp/tcp_shutdown.c               |   8 +-
 net/tcp/tcp_timer.c                  |   6 +-
 net/udp/udp.h                        |   4 +-
 net/udp/udp_callback.c               |  12 +-
 net/udp/udp_input.c                  |   2 +-
 net/udp/udp_netpoll.c                |   6 +-
 net/udp/udp_recvfrom.c               |   6 +-
 net/udp/udp_sendto_buffered.c        |  26 ++--
 net/udp/udp_sendto_unbuffered.c      |  17 ++-
 net/usrsock/usrsock.h                |   4 +-
 net/usrsock/usrsock_accept.c         |   4 +-
 net/usrsock/usrsock_bind.c           |   4 +-
 net/usrsock/usrsock_close.c          |   4 +-
 net/usrsock/usrsock_conn.c           |   4 +-
 net/usrsock/usrsock_connect.c        |   4 +-
 net/usrsock/usrsock_getpeername.c    |   4 +-
 net/usrsock/usrsock_getsockname.c    |   4 +-
 net/usrsock/usrsock_getsockopt.c     |   4 +-
 net/usrsock/usrsock_ioctl.c          |   4 +-
 net/usrsock/usrsock_listen.c         |   4 +-
 net/usrsock/usrsock_poll.c           |   4 +-
 net/usrsock/usrsock_recvmsg.c        |   4 +-
 net/usrsock/usrsock_sendmsg.c        |   4 +-
 net/usrsock/usrsock_setsockopt.c     |   4 +-
 net/usrsock/usrsock_shutdown.c       |   4 +-
 net/usrsock/usrsock_socket.c         |   4 +-
 89 files changed, 545 insertions(+), 510 deletions(-)


(nuttx) 03/04: devif_poll: only call the corresponding xxx_poll when there is data to be sent

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit c481374fb8d08ac1eb850ffcf704c0671a86b9b2
Author: zhanghongyu <zh...@xiaomi.com>
AuthorDate: Wed Nov 5 17:47:10 2025 +0800

    devif_poll: only call the corresponding xxx_poll when there is data to be sent
    
    reduce the execution consumption of irrelevant code
    
    testing the TX rates of TCP and UDP based on the Infineon board can
    increase them by 13%.
    
    Signed-off-by: zhanghongyu <zh...@xiaomi.com>
---
 include/nuttx/net/netdev.h          |   4 +
 net/arp/arp_send.c                  |   4 +-
 net/arp/arp_table.c                 |   2 +-
 net/bluetooth/bluetooth_sendmsg.c   |   4 +-
 net/can/can_sendmsg.c               |   2 +-
 net/can/can_sendmsg_buffered.c      |   6 +-
 net/devif/devif.h                   |  79 +++++++++------
 net/devif/devif_callback.c          |  25 +----
 net/devif/devif_poll.c              | 189 +++++++++++++++++++-----------------
 net/icmp/icmp_sendmsg.c             |   2 +-
 net/icmpv6/icmpv6_autoconfig.c      |   2 +-
 net/icmpv6/icmpv6_neighbor.c        |   2 +-
 net/icmpv6/icmpv6_sendmsg.c         |   8 +-
 net/ieee802154/ieee802154_sendmsg.c |   4 +-
 net/igmp/igmp_msg.c                 |   2 +-
 net/ipforward/ipfwd_forward.c       |   4 +-
 net/ipforward/ipfwd_poll.c          |   2 +-
 net/ipfrag/ipfrag.c                 |   2 +-
 net/ipfrag/ipv4_frag.c              |   2 +-
 net/ipfrag/ipv6_frag.c              |   2 +-
 net/mld/mld_msg.c                   |   2 +-
 net/mld/mld_timer.c                 |   2 +-
 net/netdev/netdev.h                 |  21 ++--
 net/netdev/netdev_register.c        |   2 +
 net/netdev/netdev_txnotify.c        |  16 ++-
 net/pkt/pkt_sendmsg_buffered.c      |   4 +-
 net/pkt/pkt_sendmsg_unbuffered.c    |   2 +-
 net/sixlowpan/sixlowpan_send.c      |   8 +-
 net/sixlowpan/sixlowpan_tcpsend.c   |   4 +-
 net/tcp/tcp_connect.c               |  14 +--
 net/tcp/tcp_recvfrom.c              |   2 +-
 net/tcp/tcp_send.c                  |   4 +-
 net/tcp/tcp_send_buffered.c         |   3 +-
 net/tcp/tcp_send_unbuffered.c       |   8 +-
 net/tcp/tcp_sendfile.c              |   8 +-
 net/tcp/tcp_timer.c                 |   2 +-
 net/udp/udp_sendto_buffered.c       |   2 +-
 net/udp/udp_sendto_unbuffered.c     |   8 +-
 38 files changed, 243 insertions(+), 216 deletions(-)

diff --git a/include/nuttx/net/netdev.h b/include/nuttx/net/netdev.h
index 40cb84d2b1b..deccb9a6563 100644
--- a/include/nuttx/net/netdev.h
+++ b/include/nuttx/net/netdev.h
@@ -411,6 +411,10 @@ struct net_driver_s
 
   net_ipv6addr_t d_ipv6draddr;  /* Default router IPv6 address */
 #endif /* CONFIG_NET_IPv6 */
+  uint32_t d_polltype;          /* The collection of protocols that need to
+                                 * be processed in devif_poll
+                                 */
+
   /* This is a new design that uses d_iob as packets input and output
    * buffer which used by some NICs such as celluler net driver. Case for
    * data input, note that d_iob maybe a linked chain only when using
diff --git a/net/arp/arp_send.c b/net/arp/arp_send.c
index ecc255ff2da..17cf96d2218 100644
--- a/net/arp/arp_send.c
+++ b/net/arp/arp_send.c
@@ -371,7 +371,7 @@ int arp_send(in_addr_t ipaddr)
 
       /* Notify the device driver that new TX data is available. */
 
-      netdev_txnotify_dev(dev);
+      netdev_txnotify_dev(dev, ARP_POLL);
 
       /* Wait for the send to complete or an error to occur.
        * net_sem_wait will also terminate if a signal is received.
@@ -504,7 +504,7 @@ int arp_send_async(in_addr_t ipaddr, arp_send_finish_cb_t cb)
 
   /* Notify the device driver that new TX data is available. */
 
-  netdev_txnotify_dev(dev);
+  netdev_txnotify_dev(dev, ARP_POLL);
 
 errout_with_lock:
   netdev_unlock(dev);
diff --git a/net/arp/arp_table.c b/net/arp/arp_table.c
index 9057846fefc..438ae1d6a8f 100644
--- a/net/arp/arp_table.c
+++ b/net/arp/arp_table.c
@@ -412,7 +412,7 @@ int arp_update(FAR struct net_driver_s *dev, in_addr_t ipaddr,
 
       dev->d_iob = NULL;
       dev->d_buf = NULL;
-      netdev_txnotify_dev(dev);
+      netdev_txnotify_dev(dev, ARP_POLL);
       netdev_iob_replace(dev, iob);
       dev->d_len = len;
     }
diff --git a/net/bluetooth/bluetooth_sendmsg.c b/net/bluetooth/bluetooth_sendmsg.c
index 94f4dd924bd..201393b72c7 100644
--- a/net/bluetooth/bluetooth_sendmsg.c
+++ b/net/bluetooth/bluetooth_sendmsg.c
@@ -338,13 +338,13 @@ static ssize_t bluetooth_sendto(FAR struct socket *psock,
         {
           /* Set up the callback in the connection */
 
-          state.is_cb->flags = PKT_POLL;
+          state.is_cb->flags = BLUETOOTH_POLL;
           state.is_cb->priv  = (FAR void *)&state;
           state.is_cb->event = bluetooth_sendto_eventhandler;
 
           /* Notify the device driver that new TX data is available. */
 
-          netdev_txnotify_dev(&radio->r_dev);
+          netdev_txnotify_dev(&radio->r_dev, BLUETOOTH_POLL);
 
           /* Wait for the send to complete or an error to occur.
            * net_sem_wait will also terminate if a signal is received.
diff --git a/net/can/can_sendmsg.c b/net/can/can_sendmsg.c
index 0939d94aaef..846d8ecc2d3 100644
--- a/net/can/can_sendmsg.c
+++ b/net/can/can_sendmsg.c
@@ -261,7 +261,7 @@ ssize_t can_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
 
       /* Notify the device driver that new TX data is available. */
 
-      netdev_txnotify_dev(dev);
+      netdev_txnotify_dev(dev, CAN_POLL);
 
       /* Wait for the send to complete or an error to occur.
        * net_sem_timedwait will also terminate if a signal is received.
diff --git a/net/can/can_sendmsg_buffered.c b/net/can/can_sendmsg_buffered.c
index 2619d8cc609..b5977c2a9ba 100644
--- a/net/can/can_sendmsg_buffered.c
+++ b/net/can/can_sendmsg_buffered.c
@@ -133,7 +133,7 @@ static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev,
 
           /* Notify the device driver that new TX data is available. */
 
-          netdev_txnotify_dev(dev);
+          netdev_txnotify_dev(dev, CAN_POLL);
         }
       else
         {
@@ -378,12 +378,12 @@ ssize_t can_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
       /* Set up the callback in the connection */
 
       conn->sndcb->flags = CAN_POLL;
-      conn->sndcb->priv = (FAR void *)conn;
+      conn->sndcb->priv  = (FAR void *)conn;
       conn->sndcb->event = psock_send_eventhandler;
 
       /* Notify the device driver that new TX data is available. */
 
-      netdev_txnotify_dev(dev);
+      netdev_txnotify_dev(dev, CAN_POLL);
     }
 
   /* unlock */
diff --git a/net/devif/devif.h b/net/devif/devif.h
index 94c3eb6b805..b067a782aab 100644
--- a/net/devif/devif.h
+++ b/net/devif/devif.h
@@ -96,7 +96,7 @@
  *   PKT_POLL             (1) timed operations, and (2) to check if the
  *   BLUETOOTH_POLL       socket layer has data that it wants to send.
  *   IEEE802154_POLL      These are socket oriented callbacks where the
- *                        context depends on the specific set.
+ *   CAN_POLL             context depends on the specific set.
  *                   OUT: Not used
  *
  *   TCP_BACKLOG      IN: There is a new connection in the backlog list set
@@ -137,9 +137,10 @@
  *   ARP_POLL         IN: Used for polling the socket layer.  This is
  *                        provided periodically from the drivers to support
  *                        (1) timed operations, and (2) to check if the ARP
- *                        layer needs to send an ARP request.  This is a
- *                        device oriented event, not associated with a
- *                        socket.
+ *                        layer needs to send an ARP request, and (3) polling
+ *                        the ARP send queue to send out pending ARP
+ *                        requests. This is a device oriented event,
+ *                        not associated with a socket.
  *                   OUT: Not used
  *
  *   ICMP_POLL        IN: Used for polling the socket layer.  This is
@@ -167,9 +168,26 @@
  *                        event, not associated with a socket.  The appdata
  *                        pointer is not used in this case.
  *                   OUT: Not used
+ *   IGMP_POLL        IN: Used for polling the socket layer.  This is
+ *                        provided periodically from the drivers to support
+ *                        (1) timed operations, and (2) to check if the IGMP
+ *                        layer needs to send an IGMP report.  This is a
+ *                        device oriented event, not associated with a
+ *                        socket.
+ *                   OUT: Not used
+ *   MLD_POLL         IN: Used for polling the socket layer.  This is
+ *                        provided periodically from the drivers to support
+ *                        (1) timed operations, and (2) to check if the MLD
+ *                        layer needs to send an MLD report.  This is a
+ *                        device oriented event, not associated with a
+ *                        socket.
+ *   IPFRAG_POLL      IN: Used for polling the IP fragment send queue to send
+ *                        out pending IP fragments.  This is a device
+ *                        oriented event, not associated with a socket.
+ *                   OUT: Not used
  */
 
-/* Bits 0-11: Connection specific event bits */
+/* Bits 0-10: Connection specific event bits */
 
 #define TCP_ACKDATA        (1 << 0)
 #define TCP_NEWDATA        (1 << 1)
@@ -185,37 +203,36 @@
 #define TCP_SNDACK         (1 << 2)
 #define TCP_REXMIT         (1 << 3)
 #define TCP_POLL           (1 << 4)
-#define UDP_POLL           TCP_POLL
-#define PKT_POLL           TCP_POLL
-#define CAN_POLL           TCP_POLL
-#define BLUETOOTH_POLL     TCP_POLL
-#define IEEE802154_POLL    TCP_POLL
-#define WPAN_POLL          TCP_POLL
-#define TCP_BACKLOG        (1 << 5)
-#define TCP_ABORT          (1 << 6)
-#define TCP_CONNECTED      (1 << 7)
-#define TCP_TIMEDOUT       (1 << 8)
-#define TCP_WAITALL        (1 << 9)
-#define TCP_TXCLOSE        (1 << 10)
-#define TCP_RXCLOSE        (1 << 11)
-
-/* Bit 12: Device specific event bits */
-
-#define NETDEV_DOWN        (1 << 12)
-
-/* Bits 13-15: Encoded device specific poll events.  Unlike connection
+#define UDP_POLL           (1 << 5)
+#define PKT_POLL           (1 << 6)
+#define CAN_POLL           (1 << 7)
+#define BLUETOOTH_POLL     (1 << 8)
+#define IEEE802154_POLL    (1 << 9)
+#define TCP_BACKLOG        (1 << 10)
+#define TCP_ABORT          (1 << 11)
+#define TCP_CONNECTED      (1 << 12)
+#define TCP_TIMEDOUT       (1 << 13)
+#define TCP_WAITALL        (1 << 14)
+#define TCP_TXCLOSE        (1 << 15)
+#define TCP_RXCLOSE        (1 << 16)
+
+/* Bit 17: Device specific event bits */
+
+#define NETDEV_DOWN        (1 << 17)
+
+/* Bits 18-24: device specific poll events.  Unlike connection
  * oriented poll events, device related poll events must distinguish
  * between what is being polled for since the callbacks all reside in
  * the same list in the network device structure.
  */
 
-#define DEVPOLL_SHIFT      (13)
-#define DEVPOLL_MASK       (7 << DEVPOLL_SHIFT)
-#  define DEVPOLL_NONE     (0 << DEVPOLL_SHIFT)
-#  define ARP_POLL         (1 << DEVPOLL_SHIFT)
-#  define ICMP_POLL        (2 << DEVPOLL_SHIFT)
-#  define ICMPv6_POLL      (3 << DEVPOLL_SHIFT)
-#  define IPFWD_POLL       (4 << DEVPOLL_SHIFT)
+#define IPFRAG_POLL        (1 << 18)
+#define ARP_POLL           (1 << 19)
+#define IGMP_POLL          (1 << 20)
+#define MLD_POLL           (1 << 21)
+#define ICMP_POLL          (1 << 22)
+#define ICMPv6_POLL        (1 << 23)
+#define IPFWD_POLL         (1 << 24)
 
 /* The set of events that and implications to the TCP connection state */
 
diff --git a/net/devif/devif_callback.c b/net/devif/devif_callback.c
index 271b897ee25..01c49878a51 100644
--- a/net/devif/devif_callback.c
+++ b/net/devif/devif_callback.c
@@ -216,30 +216,11 @@ static void devif_callback_free(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-static bool devif_event_trigger(uint32_t events, uint32_t triggers)
+static inline bool devif_event_trigger(uint32_t events, uint32_t triggers)
 {
-  /* The events are divided into a set of individual bits that may be ORed
-   * together PLUS a field that encodes a single poll event.
-   *
-   * First check if any of the individual event bits will trigger the
-   * callback.
-   */
-
-  if ((events & triggers & ~DEVPOLL_MASK) != 0)
-    {
-      return true;
-    }
-
-  /* No... check the encoded device event. */
-
-  if ((events & DEVPOLL_MASK) == (triggers & DEVPOLL_MASK))
-    {
-      return (triggers & DEVPOLL_MASK) != 0;
-    }
-
-  /* No.. this event set will not generate the callback */
+  /* check if any of the individual event bits will trigger the callback. */
 
-  return false;
+  return (events & triggers) != 0;
 }
 
 /****************************************************************************
diff --git a/net/devif/devif_poll.c b/net/devif/devif_poll.c
index fda45637450..0f1c865e4e1 100644
--- a/net/devif/devif_poll.c
+++ b/net/devif/devif_poll.c
@@ -734,13 +734,6 @@ static int devif_poll_queue(FAR struct iob_queue_s *iobq,
         }
     }
 
-  /* Notify the device driver that iob is available. */
-
-  if (iob_peek_queue(iobq) != NULL)
-    {
-      netdev_txnotify_dev(dev);
-    }
-
   /* Reuse iob buffer */
 
   if (!bstop && reused)
@@ -799,11 +792,23 @@ static int devif_poll_ipfrag(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NET_ARP_SEND_QUEUE
+#if defined(CONFIG_NET_ARP_SEND_QUEUE) || defined(CONFIG_NET_ARP_SEND)
 static int devif_poll_arp(FAR struct net_driver_s *dev,
                           devif_poll_callback_t callback)
 {
-  return devif_poll_queue(&dev->d_arpout, dev, callback);
+  int bstop;
+
+#  ifdef CONFIG_NET_ARP_SEND
+  bstop = arp_poll(dev, callback);
+  if (!bstop)
+#  endif
+    {
+#  ifdef CONFIG_NET_ARP_SEND_QUEUE
+      bstop = devif_poll_queue(&dev->d_arpout, dev, callback);
+#  endif
+    }
+
+  return bstop;
 }
 #endif
 
@@ -836,6 +841,7 @@ static int devif_poll_connections(FAR struct net_driver_s *dev,
                                   devif_poll_callback_t callback)
 {
   int bstop = false;
+  int i;
 
   /* Reset device buffer length */
 
@@ -845,136 +851,143 @@ static int devif_poll_connections(FAR struct net_driver_s *dev,
    * action.
    */
 
-#ifdef CONFIG_NET_ARP_SEND_QUEUE
-  bstop = devif_poll_arp(dev, callback);
-  if (bstop)
+  while (!bstop)
     {
-      return bstop;
-    }
-#endif
+      i = ffsl(dev->d_polltype);
+      if (i == 0)
+        {
+          break;
+        }
 
-#ifdef CONFIG_NET_IPFRAG
-  /* Traverse all of ip fragments for available packets to transfer */
+      switch (1 << (i - 1))
+        {
+#if defined(CONFIG_NET_ARP_SEND_QUEUE) || defined(CONFIG_NET_ARP_SEND)
+          case ARP_POLL:
 
-  bstop = devif_poll_ipfrag(dev, callback);
-  if (!bstop)
+            /* Traverse all of arp request or arp send queue pending iobs
+             * for available packets to transfer
+             */
+
+            bstop = devif_poll_arp(dev, callback);
+            break;
 #endif
-#ifdef CONFIG_NET_ARP_SEND
-    {
-      /* Check for pending ARP requests */
+#ifdef CONFIG_NET_IPFRAG
+          case IPFRAG_POLL:
 
-      bstop = arp_poll(dev, callback);
-    }
+            /* Traverse all of ip fragments for available packets to
+             * transfer
+             */
 
-  if (!bstop)
+            bstop = devif_poll_ipfrag(dev, callback);
+            break;
 #endif
 #ifdef CONFIG_NET_PKT
-    {
-      /* Check for pending packet socket transfer */
+          case PKT_POLL:
 
-      bstop = devif_poll_pkt_connections(dev, callback);
-    }
+            /* Check for pending packet socket transfer */
 
-  if (!bstop)
+            bstop = devif_poll_pkt_connections(dev, callback);
+            break;
 #endif
 #ifdef CONFIG_NET_CAN
-    {
-      /* Check for pending CAN socket transfer */
+          case CAN_POLL:
 
-      bstop = devif_poll_can_connections(dev, callback);
-    }
+            /* Check for pending CAN socket transfer */
 
-  if (!bstop)
+            bstop = devif_poll_can_connections(dev, callback);
+            break;
 #endif
 #ifdef CONFIG_NET_BLUETOOTH
-    {
-      /* Check for pending PF_BLUETOOTH socket transfer */
+          case BLUETOOTH_POLL:
 
-      bstop = devif_poll_bluetooth_connections(dev, callback);
-    }
+            /* Check for pending PF_BLUETOOTH socket transfer */
 
-  if (!bstop)
+            bstop = devif_poll_bluetooth_connections(dev, callback);
+            break;
 #endif
 #ifdef CONFIG_NET_IEEE802154
-    {
-      /* Check for pending PF_IEEE802154 socket transfer */
+          case IEEE802154_POLL:
 
-      bstop = devif_poll_ieee802154_connections(dev, callback);
-    }
+            /* Check for pending PF_IEEE802154 socket transfer */
 
-  if (!bstop)
+            bstop = devif_poll_ieee802154_connections(dev, callback);
+            break;
 #endif
 #ifdef CONFIG_NET_IGMP
-    {
-      /* Check for pending IGMP messages */
+          case IGMP_POLL:
 
-      bstop = devif_poll_igmp(dev, callback);
-    }
+            /* Check for pending IGMP messages */
 
-  if (!bstop)
+            bstop = devif_poll_igmp(dev, callback);
+            break;
 #endif
 #ifdef CONFIG_NET_MLD
-    {
-      /* Check for pending MLD messages */
+          case MLD_POLL:
 
-      bstop = devif_poll_mld(dev, callback);
-    }
+            /* Check for pending MLD messages */
 
-  if (!bstop)
+            bstop = devif_poll_mld(dev, callback);
+            break;
 #endif
 #ifdef NET_TCP_HAVE_STACK
-    {
-      /* Traverse all of the active TCP connections and perform the poll
-       * action.
-       */
+          case TCP_POLL:
 
-      bstop = devif_poll_tcp_connections(dev, callback);
-    }
+            /* Traverse all of the active TCP connections and perform the
+             * poll action.
+             */
 
-  if (!bstop)
+            bstop = devif_poll_tcp_connections(dev, callback);
+            break;
 #endif
 #ifdef NET_UDP_HAVE_STACK
-    {
-      /* Traverse all of the allocated UDP connections and perform
-       * the poll action
-       */
+          case UDP_POLL:
 
-      bstop = devif_poll_udp_connections(dev, callback);
-    }
+            /* Traverse all of the allocated UDP connections and perform
+             * the poll action
+             */
 
-  if (!bstop)
+            bstop = devif_poll_udp_connections(dev, callback);
+            break;
 #endif
 #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_SOCKET)
-    {
-      /* Traverse all of the tasks waiting to send an ICMP ECHO request. */
+          case ICMP_POLL:
 
-      bstop = devif_poll_icmp(dev, callback);
-    }
+            /* Traverse all of the tasks waiting to send an ICMP ECHO
+             * request.
+             */
 
-  if (!bstop)
+            bstop = devif_poll_icmp(dev, callback);
+            break;
 #endif
 #if defined(CONFIG_NET_ICMPv6_SOCKET) || defined(CONFIG_NET_ICMPv6_NEIGHBOR)
-    {
-      /* Traverse all of the tasks waiting to send an ICMPv6 ECHO request. */
+          case ICMPv6_POLL:
 
-      bstop = devif_poll_icmpv6(dev, callback);
-    }
+            /* Traverse all of the tasks waiting to send an ICMPv6 ECHO
+             * request.
+             */
 
-  if (!bstop)
+            bstop = devif_poll_icmpv6(dev, callback);
+            break;
 #endif
 #ifdef CONFIG_NET_IPFORWARD
-    {
-      /* Traverse all of the tasks waiting to forward a packet to this
-       * device.
-       */
 
-      bstop = devif_poll_forward(dev, callback);
-    }
+          /* Traverse all of the tasks waiting to forward a packet to this
+           * device.
+           */
 
-  if (!bstop)
+          case IPFWD_POLL:
+            bstop = devif_poll_forward(dev, callback);
+            break;
 #endif
-    {
-      /* Nothing more to do */
+          default:
+            nerr("ERROR: Unhandled poll type: %d\n", i - 1);
+            break;
+        }
+
+      if (!bstop)
+        {
+          dev->d_polltype &= ~(1 << (i - 1));
+        }
     }
 
   return bstop;
diff --git a/net/icmp/icmp_sendmsg.c b/net/icmp/icmp_sendmsg.c
index 659af82b1b3..808db35ac96 100644
--- a/net/icmp/icmp_sendmsg.c
+++ b/net/icmp/icmp_sendmsg.c
@@ -403,7 +403,7 @@ ssize_t icmp_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
 
       /* Notify the device driver of the availability of TX data */
 
-      netdev_txnotify_dev(dev);
+      netdev_txnotify_dev(dev, ICMP_POLL);
 
       /* Wait for either the send to complete or for timeout to occur.
        * net_sem_timedwait will also terminate if a signal is received.
diff --git a/net/icmpv6/icmpv6_autoconfig.c b/net/icmpv6/icmpv6_autoconfig.c
index bb7f5412a1b..c8603b57802 100644
--- a/net/icmpv6/icmpv6_autoconfig.c
+++ b/net/icmpv6/icmpv6_autoconfig.c
@@ -224,7 +224,7 @@ static int icmpv6_send_message(FAR struct net_driver_s *dev, bool advertise)
 
   /* Notify the device driver that new TX data is available. */
 
-  netdev_txnotify_dev(dev);
+  netdev_txnotify_dev(dev, ICMPv6_POLL);
 
   /* Wait for the send to complete or an error to occur
    * net_sem_wait will also terminate if a signal is received.
diff --git a/net/icmpv6/icmpv6_neighbor.c b/net/icmpv6/icmpv6_neighbor.c
index a689c8fb0fd..0756ac1cbcf 100644
--- a/net/icmpv6/icmpv6_neighbor.c
+++ b/net/icmpv6/icmpv6_neighbor.c
@@ -336,7 +336,7 @@ int icmpv6_neighbor(FAR struct net_driver_s *dev,
 
       /* Notify the device driver that new TX data is available. */
 
-      netdev_txnotify_dev(dev);
+      netdev_txnotify_dev(dev, ICMPv6_POLL);
 
       /* Wait for the send to complete or an error to occur.
        * net_sem_wait will also terminate if a signal is received.
diff --git a/net/icmpv6/icmpv6_sendmsg.c b/net/icmpv6/icmpv6_sendmsg.c
index 3e076611311..03a3b3e83c9 100644
--- a/net/icmpv6/icmpv6_sendmsg.c
+++ b/net/icmpv6/icmpv6_sendmsg.c
@@ -384,9 +384,9 @@ ssize_t icmpv6_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
   state.snd_cb = icmpv6_callback_alloc(dev, conn);
   if (state.snd_cb)
     {
-      state.snd_cb->flags   = (ICMPv6_POLL | NETDEV_DOWN);
-      state.snd_cb->priv    = (FAR void *)&state;
-      state.snd_cb->event   = sendto_eventhandler;
+      state.snd_cb->flags = (ICMPv6_POLL | NETDEV_DOWN);
+      state.snd_cb->priv  = (FAR void *)&state;
+      state.snd_cb->event = sendto_eventhandler;
 
       /* Setup to receive ICMPv6 ECHO replies */
 
@@ -399,7 +399,7 @@ ssize_t icmpv6_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
 
       /* Notify the device driver of the availability of TX data */
 
-      netdev_txnotify_dev(dev);
+      netdev_txnotify_dev(dev, ICMPv6_POLL);
 
       /* Wait for either the send to complete or for timeout to occur.
        * net_sem_timedwait will also terminate if a signal is received.
diff --git a/net/ieee802154/ieee802154_sendmsg.c b/net/ieee802154/ieee802154_sendmsg.c
index 4531d1f30cf..a54e8b65da3 100644
--- a/net/ieee802154/ieee802154_sendmsg.c
+++ b/net/ieee802154/ieee802154_sendmsg.c
@@ -492,13 +492,13 @@ static ssize_t ieee802154_sendto(FAR struct socket *psock,
         {
           /* Set up the callback in the connection */
 
-          state.is_cb->flags = PKT_POLL;
+          state.is_cb->flags = IEEE802154_POLL;
           state.is_cb->priv  = (FAR void *)&state;
           state.is_cb->event = ieee802154_sendto_eventhandler;
 
           /* Notify the device driver that new TX data is available. */
 
-          netdev_txnotify_dev(&radio->r_dev);
+          netdev_txnotify_dev(&radio->r_dev, IEEE802154_POLL);
 
           /* Wait for the send to complete or an error to occur.
            * net_sem_wait will also terminate if a signal is received.
diff --git a/net/igmp/igmp_msg.c b/net/igmp/igmp_msg.c
index ba044aeecfe..7d57033e527 100644
--- a/net/igmp/igmp_msg.c
+++ b/net/igmp/igmp_msg.c
@@ -106,7 +106,7 @@ int igmp_schedmsg(FAR struct igmp_group_s *group, uint8_t msgid)
   /* Notify the device that we have a packet to send */
 
   netdev_lock(dev);
-  netdev_txnotify_dev(dev);
+  netdev_txnotify_dev(dev, IGMP_POLL);
   netdev_unlock(dev);
   return OK;
 }
diff --git a/net/ipforward/ipfwd_forward.c b/net/ipforward/ipfwd_forward.c
index 50e7deb1b5d..7cec2833dea 100644
--- a/net/ipforward/ipfwd_forward.c
+++ b/net/ipforward/ipfwd_forward.c
@@ -166,7 +166,7 @@ static uint32_t ipfwd_eventhandler(FAR struct net_driver_s *dev,
           /* Copy the user data into d_appdata and send it. */
 
           devif_forward(fwd);
-          flags &= ~DEVPOLL_MASK;
+          flags &= ~IPFWD_POLL;
 
 #if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6)
           /* If both IPv4 and IPv6 support are enabled, then we will need to
@@ -244,7 +244,7 @@ int ipfwd_forward(FAR struct forward_s *fwd)
 
       /* Notify the device driver of the availability of TX data */
 
-      netdev_txnotify_dev(fwd->f_dev);
+      netdev_txnotify_dev(fwd->f_dev, IPFWD_POLL);
       return OK;
     }
 
diff --git a/net/ipforward/ipfwd_poll.c b/net/ipforward/ipfwd_poll.c
index 2add1f963a5..53fe7bd94e5 100644
--- a/net/ipforward/ipfwd_poll.c
+++ b/net/ipforward/ipfwd_poll.c
@@ -175,7 +175,7 @@ void ipfwd_poll(FAR struct net_driver_s *dev)
   flags = devif_conn_event(dev, IPFWD_POLL, dev->d_conncb);
 
 #ifdef CONFIG_NET_6LOWPAN
-  if ((flags & DEVPOLL_MASK) == 0)
+  if ((flags & IPFWD_POLL) == 0)
     {
       /* Get the L2 protocol of packet in the device's d_buf */
 
diff --git a/net/ipfrag/ipfrag.c b/net/ipfrag/ipfrag.c
index 09618dbd8a9..efc1f58989b 100644
--- a/net/ipfrag/ipfrag.c
+++ b/net/ipfrag/ipfrag.c
@@ -263,7 +263,7 @@ static void ip_fragin_timerwork(FAR void *arg)
 
                   ninfo("Send Time Exceeded ICMP%s Message to source "
                         "host\n", node->frags->isipv4 ? "v4" : "v6");
-                  netdev_txnotify_dev(dev);
+                  netdev_txnotify_dev(dev, IPFRAG_POLL);
                 }
 
               net_unlock();
diff --git a/net/ipfrag/ipv4_frag.c b/net/ipfrag/ipv4_frag.c
index b3f82329136..d62d09ee913 100644
--- a/net/ipfrag/ipv4_frag.c
+++ b/net/ipfrag/ipv4_frag.c
@@ -435,7 +435,7 @@ int32_t ipv4_fragout(FAR struct net_driver_s *dev, uint16_t mtu)
   g_netstats.ipv4.sent += nfrags - 1;
 #endif
 
-  netdev_txnotify_dev(dev);
+  netdev_txnotify_dev(dev, IPFRAG_POLL);
 
   return OK;
 
diff --git a/net/ipfrag/ipv6_frag.c b/net/ipfrag/ipv6_frag.c
index 69b09580d69..ffae571ef48 100644
--- a/net/ipfrag/ipv6_frag.c
+++ b/net/ipfrag/ipv6_frag.c
@@ -662,7 +662,7 @@ int32_t ipv6_fragout(FAR struct net_driver_s *dev, uint16_t mtu)
   g_netstats.ipv6.sent += nfrags - 1;
 #endif
 
-  netdev_txnotify_dev(dev);
+  netdev_txnotify_dev(dev, IPFRAG_POLL);
 
   return OK;
 
diff --git a/net/mld/mld_msg.c b/net/mld/mld_msg.c
index 8b1d71ce40c..4cb6a6b1d4a 100644
--- a/net/mld/mld_msg.c
+++ b/net/mld/mld_msg.c
@@ -81,7 +81,7 @@ int mld_schedmsg(FAR struct mld_group_s *group, uint8_t msgtype)
   /* Notify the device that we have a packet to send */
 
   netdev_lock(dev);
-  netdev_txnotify_dev(dev);
+  netdev_txnotify_dev(dev, MLD_POLL);
   netdev_unlock(dev);
   return OK;
 }
diff --git a/net/mld/mld_timer.c b/net/mld/mld_timer.c
index 0556082c487..2ffeb977f06 100644
--- a/net/mld/mld_timer.c
+++ b/net/mld/mld_timer.c
@@ -159,7 +159,7 @@ static void mld_gendog_work(FAR void *arg)
 
       /* Notify the device that we have a packet to send */
 
-      netdev_txnotify_dev(dev);
+      netdev_txnotify_dev(dev, MLD_POLL);
 
       /* Restart the Querier timer */
 
diff --git a/net/netdev/netdev.h b/net/netdev/netdev.h
index 5f4a541cb19..1e3003de02d 100644
--- a/net/netdev/netdev.h
+++ b/net/netdev/netdev.h
@@ -310,8 +310,9 @@ FAR struct net_driver_s *netdev_default(void);
  *   data is available.
  *
  * Input Parameters:
- *   lipaddr - The local address bound to the socket
- *   ripaddr - The remote address to send the data
+ *   lipaddr  - The local address bound to the socket
+ *   ripaddr  - The remote address to send the data
+ *   polltype - The type of poll to be triggered for the device.
  *
  * Returned Value:
  *  None
@@ -319,7 +320,8 @@ FAR struct net_driver_s *netdev_default(void);
  ****************************************************************************/
 
 #ifdef CONFIG_NET_IPv4
-void netdev_ipv4_txnotify(in_addr_t lipaddr, in_addr_t ripaddr);
+void netdev_ipv4_txnotify(in_addr_t lipaddr, in_addr_t ripaddr,
+                          uint32_t polltype);
 #endif /* CONFIG_NET_IPv4 */
 
 /****************************************************************************
@@ -330,8 +332,9 @@ void netdev_ipv4_txnotify(in_addr_t lipaddr, in_addr_t ripaddr);
  *   data is available.
  *
  * Input Parameters:
- *   lipaddr - The local address bound to the socket
- *   ripaddr - The remote address to send the data
+ *   lipaddr  - The local address bound to the socket
+ *   ripaddr  - The remote address to send the data
+ *   polltype - The type of poll to be triggered for the device.
  *
  * Returned Value:
  *  None
@@ -340,7 +343,8 @@ void netdev_ipv4_txnotify(in_addr_t lipaddr, in_addr_t ripaddr);
 
 #ifdef CONFIG_NET_IPv6
 void netdev_ipv6_txnotify(FAR const net_ipv6addr_t lipaddr,
-                          FAR const net_ipv6addr_t ripaddr);
+                          FAR const net_ipv6addr_t ripaddr,
+                          uint32_t polltype);
 #endif /* CONFIG_NET_IPv6 */
 
 /****************************************************************************
@@ -352,14 +356,15 @@ void netdev_ipv6_txnotify(FAR const net_ipv6addr_t lipaddr,
  *   packet will be routed.
  *
  * Input Parameters:
- *   dev - The network device driver state structure.
+ *   dev      - The network device driver state structure.
+ *   polltype - The type of poll to be triggered for the device.
  *
  * Returned Value:
  *  None
  *
  ****************************************************************************/
 
-void netdev_txnotify_dev(FAR struct net_driver_s *dev);
+void netdev_txnotify_dev(FAR struct net_driver_s *dev, uint32_t polltype);
 
 /****************************************************************************
  * Name: netdev_count
diff --git a/net/netdev/netdev_register.c b/net/netdev/netdev_register.c
index e23daa44082..f8e5679487e 100644
--- a/net/netdev/netdev_register.c
+++ b/net/netdev/netdev_register.c
@@ -425,6 +425,8 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
       dev->d_conncb_tail = NULL;
       dev->d_devcb = NULL;
 
+      dev->d_polltype = 0;
+
       nxrmutex_init(&dev->d_lock);
 
       /* We need exclusive access for the following operations */
diff --git a/net/netdev/netdev_txnotify.c b/net/netdev/netdev_txnotify.c
index 1320a871f74..95884feda43 100644
--- a/net/netdev/netdev_txnotify.c
+++ b/net/netdev/netdev_txnotify.c
@@ -57,11 +57,12 @@
  ****************************************************************************/
 
 #ifdef CONFIG_NET_IPv4
-void netdev_ipv4_txnotify(in_addr_t lipaddr, in_addr_t ripaddr)
+void netdev_ipv4_txnotify(in_addr_t lipaddr, in_addr_t ripaddr,
+                          uint32_t polltype)
 {
   /* Find the device driver that serves the subnet of the remote address */
 
-  netdev_txnotify_dev(netdev_findby_ripv4addr(lipaddr, ripaddr));
+  netdev_txnotify_dev(netdev_findby_ripv4addr(lipaddr, ripaddr), polltype);
 }
 #endif /* CONFIG_NET_IPv4 */
 
@@ -83,11 +84,12 @@ void netdev_ipv4_txnotify(in_addr_t lipaddr, in_addr_t ripaddr)
 
 #ifdef CONFIG_NET_IPv6
 void netdev_ipv6_txnotify(FAR const net_ipv6addr_t lipaddr,
-                          FAR const net_ipv6addr_t ripaddr)
+                          FAR const net_ipv6addr_t ripaddr,
+                          uint32_t polltype)
 {
   /* Find the device driver that serves the subnet of the remote address */
 
-  netdev_txnotify_dev(netdev_findby_ripv6addr(lipaddr, ripaddr));
+  netdev_txnotify_dev(netdev_findby_ripv6addr(lipaddr, ripaddr), polltype);
 }
 #endif /* CONFIG_NET_IPv6 */
 
@@ -107,10 +109,14 @@ void netdev_ipv6_txnotify(FAR const net_ipv6addr_t lipaddr,
  *
  ****************************************************************************/
 
-void netdev_txnotify_dev(FAR struct net_driver_s *dev)
+void netdev_txnotify_dev(FAR struct net_driver_s *dev, uint32_t polltype)
 {
   if (dev != NULL && dev->d_txavail != NULL)
     {
+      /* Set the poll type flags */
+
+      dev->d_polltype |= polltype;
+
       /* Notify the device driver that new TX data is available. */
 
       dev->d_txavail(dev);
diff --git a/net/pkt/pkt_sendmsg_buffered.c b/net/pkt/pkt_sendmsg_buffered.c
index 9bfc97fb6a2..2ebbdc01507 100644
--- a/net/pkt/pkt_sendmsg_buffered.c
+++ b/net/pkt/pkt_sendmsg_buffered.c
@@ -156,7 +156,7 @@ static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev,
 
           /* Notify the device driver that new TX data is available. */
 
-          netdev_txnotify_dev(dev);
+          netdev_txnotify_dev(dev, PKT_POLL);
         }
       else
         {
@@ -375,7 +375,7 @@ ssize_t pkt_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
 
       /* Notify the device driver that new TX data is available. */
 
-      netdev_txnotify_dev(dev);
+      netdev_txnotify_dev(dev, PKT_POLL);
       conn_dev_unlock(&conn->sconn, dev);
     }
 
diff --git a/net/pkt/pkt_sendmsg_unbuffered.c b/net/pkt/pkt_sendmsg_unbuffered.c
index afcbad3e314..db954e0d746 100644
--- a/net/pkt/pkt_sendmsg_unbuffered.c
+++ b/net/pkt/pkt_sendmsg_unbuffered.c
@@ -239,7 +239,7 @@ ssize_t pkt_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
 
           /* Notify the device driver that new TX data is available. */
 
-          netdev_txnotify_dev(dev);
+          netdev_txnotify_dev(dev, PKT_POLL);
 
           /* Wait for the send to complete or an error to occur.
            * net_sem_wait will also terminate if a signal is received.
diff --git a/net/sixlowpan/sixlowpan_send.c b/net/sixlowpan/sixlowpan_send.c
index d2d4230ddb0..0f9e3a2b4c0 100644
--- a/net/sixlowpan/sixlowpan_send.c
+++ b/net/sixlowpan/sixlowpan_send.c
@@ -133,7 +133,7 @@ static uint32_t send_eventhandler(FAR struct net_driver_s *dev,
 
   if ((flags & WPAN_NEWDATA) == 0)
     {
-      DEBUGASSERT((flags & WPAN_POLL) != 0);
+      DEBUGASSERT((flags & UDP_POLL) != 0);
 
       /* Transfer the frame list to the IEEE802.15.4 MAC device */
 
@@ -142,7 +142,7 @@ static uint32_t send_eventhandler(FAR struct net_driver_s *dev,
                                sinfo->s_ipv6hdr, sinfo->s_buf, sinfo->s_len,
                                sinfo->s_destmac);
 
-      flags &= ~WPAN_POLL;
+      flags &= ~UDP_POLL;
       neighbor_reachable(dev);
       goto end_wait;
     }
@@ -239,13 +239,13 @@ int sixlowpan_send(FAR struct net_driver_s *dev,
 
           /* Set up the callback in the connection */
 
-          sinfo.s_cb->flags = (NETDEV_DOWN | WPAN_POLL);
+          sinfo.s_cb->flags = (NETDEV_DOWN | UDP_POLL);
           sinfo.s_cb->priv  = (FAR void *)&sinfo;
           sinfo.s_cb->event = send_eventhandler;
 
           /* Notify the IEEE802.15.4 MAC that we have data to send. */
 
-          netdev_txnotify_dev(dev);
+          netdev_txnotify_dev(dev, UDP_POLL);
 
           /* Wait for the send to complete or an error to occur.
            * net_sem_timedwait will also terminate if a signal is received.
diff --git a/net/sixlowpan/sixlowpan_tcpsend.c b/net/sixlowpan/sixlowpan_tcpsend.c
index 26344b2ba91..043a239b6eb 100644
--- a/net/sixlowpan/sixlowpan_tcpsend.c
+++ b/net/sixlowpan/sixlowpan_tcpsend.c
@@ -628,7 +628,7 @@ static int sixlowpan_send_packet(FAR struct socket *psock,
           /* Set up the callback in the connection */
 
           sinfo.s_cb->flags = (NETDEV_DOWN | TCP_ACKDATA | TCP_REXMIT |
-                               TCP_DISCONN_EVENTS | WPAN_POLL);
+                               TCP_DISCONN_EVENTS | TCP_POLL);
           sinfo.s_cb->priv  = (FAR void *)&sinfo;
           sinfo.s_cb->event = tcp_send_eventhandler;
 
@@ -640,7 +640,7 @@ static int sixlowpan_send_packet(FAR struct socket *psock,
 
           /* Notify the IEEE802.15.4 MAC that we have data to send. */
 
-          netdev_txnotify_dev(dev);
+          netdev_txnotify_dev(dev, TCP_POLL);
 
           /* Wait for the send to complete or an error to occur.
            * net_sem_timedwait will also terminate if a signal is received.
diff --git a/net/tcp/tcp_connect.c b/net/tcp/tcp_connect.c
index eb8ee1691b6..abc2e12711e 100644
--- a/net/tcp/tcp_connect.c
+++ b/net/tcp/tcp_connect.c
@@ -103,11 +103,11 @@ static inline int psock_setup_callbacks(FAR struct socket *psock,
     {
       /* Set up the connection event handler */
 
-      pstate->tc_cb->flags   = (TCP_NEWDATA | TCP_ABORT | TCP_TIMEDOUT |
-                                TCP_CONNECTED | NETDEV_DOWN);
-      pstate->tc_cb->priv    = (FAR void *)pstate;
-      pstate->tc_cb->event   = psock_connect_eventhandler;
-      ret                    = OK;
+      pstate->tc_cb->flags = (TCP_NEWDATA | TCP_ABORT | TCP_TIMEDOUT |
+                              TCP_CONNECTED | NETDEV_DOWN);
+      pstate->tc_cb->priv  = (FAR void *)pstate;
+      pstate->tc_cb->event = psock_connect_eventhandler;
+      ret                  = OK;
     }
 
   return ret;
@@ -379,7 +379,7 @@ int psock_tcp_connect(FAR struct socket *psock,
 
               /* Notify the device driver that new connection is available. */
 
-              netdev_txnotify_dev(conn->dev);
+              netdev_txnotify_dev(conn->dev, TCP_POLL);
 
               /* Wait for either the connect to complete or for an
                * error/timeout to occur.
@@ -442,7 +442,7 @@ int psock_tcp_connect(FAR struct socket *psock,
 
           /* Notify the device driver that new connection is available. */
 
-          netdev_txnotify_dev(conn->dev);
+          netdev_txnotify_dev(conn->dev, TCP_POLL);
         }
     }
 
diff --git a/net/tcp/tcp_recvfrom.c b/net/tcp/tcp_recvfrom.c
index f7f6e44fac0..736fc12c131 100644
--- a/net/tcp/tcp_recvfrom.c
+++ b/net/tcp/tcp_recvfrom.c
@@ -839,7 +839,7 @@ static ssize_t tcp_recvfrom_one(FAR struct tcp_conn_s *conn, FAR void *buf,
     {
       conn_unlock(&conn->sconn);
       netdev_lock(conn->dev);
-      netdev_txnotify_dev(conn->dev);
+      netdev_txnotify_dev(conn->dev, TCP_POLL);
       netdev_unlock(conn->dev);
       conn_lock(&conn->sconn);
     }
diff --git a/net/tcp/tcp_send.c b/net/tcp/tcp_send.c
index ce09b57c2f6..5713d2d7eed 100644
--- a/net/tcp/tcp_send.c
+++ b/net/tcp/tcp_send.c
@@ -699,7 +699,7 @@ void tcp_send_txnotify(FAR struct socket *psock,
     {
       /* Notify the device driver that send data is available */
 
-      netdev_ipv4_txnotify(conn->u.ipv4.laddr, conn->u.ipv4.raddr);
+      netdev_ipv4_txnotify(conn->u.ipv4.laddr, conn->u.ipv4.raddr, TCP_POLL);
     }
 #endif /* CONFIG_NET_IPv4 */
 
@@ -711,7 +711,7 @@ void tcp_send_txnotify(FAR struct socket *psock,
       /* Notify the device driver that send data is available */
 
       DEBUGASSERT(psock->s_domain == PF_INET6);
-      netdev_ipv6_txnotify(conn->u.ipv6.laddr, conn->u.ipv6.raddr);
+      netdev_ipv6_txnotify(conn->u.ipv6.laddr, conn->u.ipv6.raddr, TCP_POLL);
     }
 #endif /* CONFIG_NET_IPv6 */
 }
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index 68711453a8c..5ab17b54c91 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -626,8 +626,7 @@ static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev,
                        */
 
                       conn->timeout = true;
-
-                      netdev_txnotify_dev(conn->dev);
+                      netdev_txnotify_dev(conn->dev, TCP_POLL);
                       netdev_iob_replace(dev, iob);
                       dev->d_buf = buf;
                       dev->d_appdata = appdata;
diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c
index fa5844b9866..77a62ef30ad 100644
--- a/net/tcp/tcp_send_unbuffered.c
+++ b/net/tcp/tcp_send_unbuffered.c
@@ -597,10 +597,10 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
 
           /* Set up the callback in the connection */
 
-          state.snd_cb->flags   = (TCP_ACKDATA | TCP_REXMIT | TCP_POLL |
-                                   TCP_DISCONN_EVENTS | TCP_TXCLOSE);
-          state.snd_cb->priv    = (FAR void *)&state;
-          state.snd_cb->event   = tcpsend_eventhandler;
+          state.snd_cb->flags = (TCP_ACKDATA | TCP_REXMIT | TCP_POLL |
+                                 TCP_DISCONN_EVENTS | TCP_TXCLOSE);
+          state.snd_cb->priv  = (FAR void *)&state;
+          state.snd_cb->event = tcpsend_eventhandler;
 
           /* Notify the device driver of the availability of TX data */
 
diff --git a/net/tcp/tcp_sendfile.c b/net/tcp/tcp_sendfile.c
index 429c6449f3f..0aabc9c88d1 100644
--- a/net/tcp/tcp_sendfile.c
+++ b/net/tcp/tcp_sendfile.c
@@ -511,10 +511,10 @@ ssize_t tcp_sendfile(FAR struct socket *psock, FAR struct file *infile,
 
   /* Set up the callback in the connection */
 
-  state.snd_cb->flags    = (TCP_ACKDATA | TCP_REXMIT | TCP_POLL |
-                            TCP_DISCONN_EVENTS);
-  state.snd_cb->priv     = (FAR void *)&state;
-  state.snd_cb->event    = sendfile_eventhandler;
+  state.snd_cb->flags = (TCP_ACKDATA | TCP_REXMIT | TCP_POLL |
+                         TCP_DISCONN_EVENTS);
+  state.snd_cb->priv  = (FAR void *)&state;
+  state.snd_cb->event = sendfile_eventhandler;
 
   /* Notify the device driver of the availability of TX data */
 
diff --git a/net/tcp/tcp_timer.c b/net/tcp/tcp_timer.c
index 5422616d407..368a3379b20 100644
--- a/net/tcp/tcp_timer.c
+++ b/net/tcp/tcp_timer.c
@@ -155,7 +155,7 @@ static void tcp_timer_expiry(FAR void *arg)
           tcp_conn_list_unlock();
           conn->timeout = true;
           netdev_lock(conn->dev);
-          netdev_txnotify_dev(conn->dev);
+          netdev_txnotify_dev(conn->dev, TCP_POLL);
           netdev_unlock(conn->dev);
           return;
         }
diff --git a/net/udp/udp_sendto_buffered.c b/net/udp/udp_sendto_buffered.c
index 194ce3c5dfd..683879577e6 100644
--- a/net/udp/udp_sendto_buffered.c
+++ b/net/udp/udp_sendto_buffered.c
@@ -357,7 +357,7 @@ static int sendto_next_transfer(FAR struct udp_conn_s *conn)
 
   /* Notify the device driver of the availability of TX data */
 
-  netdev_txnotify_dev(dev);
+  netdev_txnotify_dev(dev, UDP_POLL);
 
 out:
   conn_dev_unlock(&conn->sconn, dev);
diff --git a/net/udp/udp_sendto_unbuffered.c b/net/udp/udp_sendto_unbuffered.c
index ffa190f6e2a..5eecb9f7402 100644
--- a/net/udp/udp_sendto_unbuffered.c
+++ b/net/udp/udp_sendto_unbuffered.c
@@ -471,13 +471,13 @@ ssize_t psock_udp_sendto(FAR struct socket *psock, FAR const void *buf,
   state.st_cb = udp_callback_alloc(state.st_dev, conn);
   if (state.st_cb)
     {
-      state.st_cb->flags   = (UDP_POLL | NETDEV_DOWN);
-      state.st_cb->priv    = (FAR void *)&state;
-      state.st_cb->event   = sendto_eventhandler;
+      state.st_cb->flags = (UDP_POLL | NETDEV_DOWN);
+      state.st_cb->priv  = (FAR void *)&state;
+      state.st_cb->event = sendto_eventhandler;
 
       /* Notify the device driver of the availability of TX data */
 
-      netdev_txnotify_dev(state.st_dev);
+      netdev_txnotify_dev(state.st_dev, UDP_POLL);
 
       /* Wait for either the receive to complete or for an error/timeout to
        * occur. NOTES:  net_sem_timedwait will also terminate if a signal


(nuttx) 02/04: net/devif_callback: change flags type from uint16_t to uint32_t

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit a0b847bf1b1176c3040ea11679a964d67f4a3c6b
Author: zhanghongyu <zh...@xiaomi.com>
AuthorDate: Wed Nov 12 11:34:06 2025 +0800

    net/devif_callback: change flags type from uint16_t to uint32_t
    
    increase the size of the flag to prepare for precise xxx_POLL.
    
    Signed-off-by: zhanghongyu <zh...@xiaomi.com>
---
 net/arp/arp_send.c                   |  6 +++---
 net/bluetooth/bluetooth.h            |  6 +++---
 net/bluetooth/bluetooth_callback.c   |  8 ++++----
 net/bluetooth/bluetooth_recvmsg.c    |  8 ++++----
 net/bluetooth/bluetooth_sendmsg.c    |  8 ++++----
 net/can/can.h                        |  4 ++--
 net/can/can_callback.c               | 10 +++++-----
 net/can/can_input.c                  |  2 +-
 net/can/can_recvmsg.c                |  4 ++--
 net/can/can_sendmsg.c                |  4 ++--
 net/can/can_sendmsg_buffered.c       |  4 ++--
 net/can/can_sockif.c                 |  4 ++--
 net/devif/devif.h                    | 10 +++++-----
 net/devif/devif_callback.c           |  6 +++---
 net/icmp/icmp_netpoll.c              |  6 +++---
 net/icmp/icmp_recvmsg.c              |  6 +++---
 net/icmp/icmp_sendmsg.c              |  6 +++---
 net/icmpv6/icmpv6_autoconfig.c       |  6 +++---
 net/icmpv6/icmpv6_neighbor.c         |  6 +++---
 net/icmpv6/icmpv6_netpoll.c          |  6 +++---
 net/icmpv6/icmpv6_recvmsg.c          |  6 +++---
 net/icmpv6/icmpv6_sendmsg.c          |  6 +++---
 net/ieee802154/ieee802154.h          |  4 ++--
 net/ieee802154/ieee802154_callback.c |  6 +++---
 net/ieee802154/ieee802154_recvmsg.c  |  8 ++++----
 net/ieee802154/ieee802154_sendmsg.c  |  6 +++---
 net/ipforward/ipfwd_forward.c        |  6 +++---
 net/ipforward/ipfwd_poll.c           |  2 +-
 net/pkt/pkt.h                        |  4 ++--
 net/pkt/pkt_callback.c               |  6 +++---
 net/pkt/pkt_input.c                  |  2 +-
 net/pkt/pkt_netpoll.c                |  6 +++---
 net/pkt/pkt_recvmsg.c                |  6 +++---
 net/pkt/pkt_sendmsg_buffered.c       |  4 ++--
 net/pkt/pkt_sendmsg_unbuffered.c     |  6 +++---
 net/sixlowpan/sixlowpan_send.c       |  6 +++---
 net/sixlowpan/sixlowpan_tcpsend.c    |  6 +++---
 net/tcp/tcp.h                        | 12 ++++++------
 net/tcp/tcp_callback.c               | 16 ++++++++--------
 net/tcp/tcp_close.c                  |  6 +++---
 net/tcp/tcp_connect.c                | 10 +++++-----
 net/tcp/tcp_dump.c                   |  6 +++---
 net/tcp/tcp_input.c                  |  2 +-
 net/tcp/tcp_monitor.c                | 21 +++++++++++----------
 net/tcp/tcp_netpoll.c                |  6 +++---
 net/tcp/tcp_recvfrom.c               | 10 +++++-----
 net/tcp/tcp_send_buffered.c          | 12 ++++++------
 net/tcp/tcp_send_unbuffered.c        |  6 +++---
 net/tcp/tcp_sendfile.c               |  6 +++---
 net/tcp/tcp_shutdown.c               |  6 +++---
 net/tcp/tcp_timer.c                  |  2 +-
 net/udp/udp.h                        |  4 ++--
 net/udp/udp_callback.c               | 12 ++++++------
 net/udp/udp_input.c                  |  2 +-
 net/udp/udp_netpoll.c                |  6 +++---
 net/udp/udp_recvfrom.c               |  6 +++---
 net/udp/udp_sendto_buffered.c        | 12 ++++++------
 net/udp/udp_sendto_unbuffered.c      |  6 +++---
 net/usrsock/usrsock.h                |  4 ++--
 net/usrsock/usrsock_accept.c         |  4 ++--
 net/usrsock/usrsock_bind.c           |  4 ++--
 net/usrsock/usrsock_close.c          |  4 ++--
 net/usrsock/usrsock_conn.c           |  4 ++--
 net/usrsock/usrsock_connect.c        |  4 ++--
 net/usrsock/usrsock_getpeername.c    |  4 ++--
 net/usrsock/usrsock_getsockname.c    |  4 ++--
 net/usrsock/usrsock_getsockopt.c     |  4 ++--
 net/usrsock/usrsock_ioctl.c          |  4 ++--
 net/usrsock/usrsock_listen.c         |  4 ++--
 net/usrsock/usrsock_poll.c           |  4 ++--
 net/usrsock/usrsock_recvmsg.c        |  4 ++--
 net/usrsock/usrsock_sendmsg.c        |  4 ++--
 net/usrsock/usrsock_setsockopt.c     |  4 ++--
 net/usrsock/usrsock_shutdown.c       |  4 ++--
 net/usrsock/usrsock_socket.c         |  4 ++--
 75 files changed, 224 insertions(+), 223 deletions(-)

diff --git a/net/arp/arp_send.c b/net/arp/arp_send.c
index b56300578be..ecc255ff2da 100644
--- a/net/arp/arp_send.c
+++ b/net/arp/arp_send.c
@@ -81,12 +81,12 @@ static void arp_send_terminate(FAR struct net_driver_s *dev,
  * Name: arp_send_eventhandler
  ****************************************************************************/
 
-static uint16_t arp_send_eventhandler(FAR struct net_driver_s *dev,
-                                      FAR void *priv, uint16_t flags)
+static uint32_t arp_send_eventhandler(FAR struct net_driver_s *dev,
+                                      FAR void *priv, uint32_t flags)
 {
   FAR struct arp_send_s *state = (FAR struct arp_send_s *)priv;
 
-  ninfo("flags: %04x sent: %d\n", flags, state->snd_sent);
+  ninfo("flags: %" PRIx32 " sent: %d\n", flags, state->snd_sent);
 
   if (state)
     {
diff --git a/net/bluetooth/bluetooth.h b/net/bluetooth/bluetooth.h
index aeac3269a31..11c0606e3fa 100644
--- a/net/bluetooth/bluetooth.h
+++ b/net/bluetooth/bluetooth.h
@@ -254,9 +254,9 @@ FAR struct bluetooth_conn_s *
  *
  ****************************************************************************/
 
-uint16_t bluetooth_callback(FAR struct radio_driver_s *radio,
-                             FAR struct bluetooth_conn_s *conn,
-                             uint16_t flags);
+uint32_t bluetooth_callback(FAR struct radio_driver_s *radio,
+                            FAR struct bluetooth_conn_s *conn,
+                            uint32_t flags);
 
 /****************************************************************************
  * Name: bluetooth_recvmsg
diff --git a/net/bluetooth/bluetooth_callback.c b/net/bluetooth/bluetooth_callback.c
index 808ed9ee708..50487c769cb 100644
--- a/net/bluetooth/bluetooth_callback.c
+++ b/net/bluetooth/bluetooth_callback.c
@@ -59,11 +59,11 @@
  *
  ****************************************************************************/
 
-uint16_t bluetooth_callback(FAR struct radio_driver_s *radio,
-                             FAR struct bluetooth_conn_s *conn,
-                             uint16_t flags)
+uint32_t bluetooth_callback(FAR struct radio_driver_s *radio,
+                            FAR struct bluetooth_conn_s *conn,
+                            uint32_t flags)
 {
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   /* Some sanity checking */
 
diff --git a/net/bluetooth/bluetooth_recvmsg.c b/net/bluetooth/bluetooth_recvmsg.c
index 9400e22cbe6..da42b2a28a6 100644
--- a/net/bluetooth/bluetooth_recvmsg.c
+++ b/net/bluetooth/bluetooth_recvmsg.c
@@ -206,15 +206,15 @@ static ssize_t
  *
  ****************************************************************************/
 
-static uint16_t bluetooth_recvfrom_eventhandler(FAR struct net_driver_s *dev,
-                                                 FAR void *pvpriv,
-                                                 uint16_t flags)
+static uint32_t bluetooth_recvfrom_eventhandler(FAR struct net_driver_s *dev,
+                                                FAR void *pvpriv,
+                                                uint32_t flags)
 {
   FAR struct bluetooth_recvfrom_s *pstate;
   FAR struct radio_driver_s *radio;
   ssize_t ret;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   DEBUGASSERT(pvpriv != NULL && dev != NULL);
 
diff --git a/net/bluetooth/bluetooth_sendmsg.c b/net/bluetooth/bluetooth_sendmsg.c
index b9c54ef8725..94f4dd924bd 100644
--- a/net/bluetooth/bluetooth_sendmsg.c
+++ b/net/bluetooth/bluetooth_sendmsg.c
@@ -83,9 +83,9 @@ struct bluetooth_sendto_s
  * Name: bluetooth_sendto_eventhandler
  ****************************************************************************/
 
-static uint16_t bluetooth_sendto_eventhandler(FAR struct net_driver_s *dev,
-                                               FAR void *pvpriv,
-                                               uint16_t flags)
+static uint32_t bluetooth_sendto_eventhandler(FAR struct net_driver_s *dev,
+                                              FAR void *pvpriv,
+                                              uint32_t flags)
 {
   FAR struct radio_driver_s *radio;
   FAR struct bluetooth_sendto_s *pstate;
@@ -110,7 +110,7 @@ static uint16_t bluetooth_sendto_eventhandler(FAR struct net_driver_s *dev,
   pstate = pvpriv;
   radio  = (FAR struct radio_driver_s *)dev;
 
-  ninfo("flags: %04x sent: %zd\n", flags, pstate->is_sent);
+  ninfo("flags: %" PRIx32 " sent: %zd\n", flags, pstate->is_sent);
 
   if (pstate != NULL && (flags & BLUETOOTH_POLL) != 0)
     {
diff --git a/net/can/can.h b/net/can/can.h
index 56f29506477..26ce489d4f1 100644
--- a/net/can/can.h
+++ b/net/can/can.h
@@ -237,8 +237,8 @@ FAR struct can_conn_s *can_active(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-uint16_t can_callback(FAR struct net_driver_s *dev,
-                      FAR struct can_conn_s *conn, uint16_t flags);
+uint32_t can_callback(FAR struct net_driver_s *dev,
+                      FAR struct can_conn_s *conn, uint32_t flags);
 
 /****************************************************************************
  * Name: can_datahandler
diff --git a/net/can/can_callback.c b/net/can/can_callback.c
index e022f8ebd27..6d31fda2152 100644
--- a/net/can/can_callback.c
+++ b/net/can/can_callback.c
@@ -62,13 +62,13 @@
  *
  ****************************************************************************/
 
-static inline uint16_t
+static inline uint32_t
 can_data_event(FAR struct net_driver_s *dev, FAR struct can_conn_s *conn,
-               uint16_t flags)
+               uint32_t flags)
 {
   int buflen = dev->d_len;
   uint16_t recvlen;
-  uint16_t ret;
+  uint32_t ret;
 
 #ifdef CONFIG_NET_TIMESTAMP
   buflen -= sizeof(struct timeval);
@@ -118,8 +118,8 @@ can_data_event(FAR struct net_driver_s *dev, FAR struct can_conn_s *conn,
  *
  ****************************************************************************/
 
-uint16_t can_callback(FAR struct net_driver_s *dev,
-                      FAR struct can_conn_s *conn, uint16_t flags)
+uint32_t can_callback(FAR struct net_driver_s *dev,
+                      FAR struct can_conn_s *conn, uint32_t flags)
 {
   /* Some sanity checking */
 
diff --git a/net/can/can_input.c b/net/can/can_input.c
index 40f8a36cf37..a8d8da8affd 100644
--- a/net/can/can_input.c
+++ b/net/can/can_input.c
@@ -159,7 +159,7 @@ const uint8_t g_len_to_can_dlc[65] =
 static int can_input_conn(FAR struct net_driver_s *dev,
                           FAR struct can_conn_s *conn)
 {
-  uint16_t flags;
+  uint32_t flags;
   uint16_t buflen = dev->d_len;
   int ret = OK;
 
diff --git a/net/can/can_recvmsg.c b/net/can/can_recvmsg.c
index 38440493ef4..3d9f90eaac9 100644
--- a/net/can/can_recvmsg.c
+++ b/net/can/can_recvmsg.c
@@ -288,8 +288,8 @@ static inline int can_readahead(struct can_recvfrom_s *pstate)
   return 0;
 }
 
-static uint16_t can_recvfrom_eventhandler(FAR struct net_driver_s *dev,
-                                          FAR void *pvpriv, uint16_t flags)
+static uint32_t can_recvfrom_eventhandler(FAR struct net_driver_s *dev,
+                                          FAR void *pvpriv, uint32_t flags)
 {
   struct can_recvfrom_s *pstate = pvpriv;
 
diff --git a/net/can/can_sendmsg.c b/net/can/can_sendmsg.c
index 373538a5d08..0939d94aaef 100644
--- a/net/can/can_sendmsg.c
+++ b/net/can/can_sendmsg.c
@@ -79,8 +79,8 @@ struct send_s
  * Name: psock_send_eventhandler
  ****************************************************************************/
 
-static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
-                                        FAR void *pvpriv, uint16_t flags)
+static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev,
+                                        FAR void *pvpriv, uint32_t flags)
 {
   FAR struct send_s *pstate = pvpriv;
 
diff --git a/net/can/can_sendmsg_buffered.c b/net/can/can_sendmsg_buffered.c
index 09b8ca4d384..2619d8cc609 100644
--- a/net/can/can_sendmsg_buffered.c
+++ b/net/can/can_sendmsg_buffered.c
@@ -61,8 +61,8 @@
  * Name: psock_send_eventhandler
  ****************************************************************************/
 
-static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
-                                        FAR void *pvpriv, uint16_t flags)
+static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev,
+                                        FAR void *pvpriv, uint32_t flags)
 {
   FAR struct can_conn_s *conn = pvpriv;
 
diff --git a/net/can/can_sockif.c b/net/can/can_sockif.c
index e0f2eee2665..ac6e95ff436 100644
--- a/net/can/can_sockif.c
+++ b/net/can/can_sockif.c
@@ -112,8 +112,8 @@ const struct sock_intf_s g_can_sockif =
  *
  ****************************************************************************/
 
-static uint16_t can_poll_eventhandler(FAR struct net_driver_s *dev,
-                                      FAR void *pvpriv, uint16_t flags)
+static uint32_t can_poll_eventhandler(FAR struct net_driver_s *dev,
+                                      FAR void *pvpriv, uint32_t flags)
 {
   FAR struct can_poll_s *info = pvpriv;
 
diff --git a/net/devif/devif.h b/net/devif/devif.h
index 872cf916cf6..94c3eb6b805 100644
--- a/net/devif/devif.h
+++ b/net/devif/devif.h
@@ -267,9 +267,9 @@
 
 struct net_driver_s;       /* Forward reference */
 
-typedef CODE uint16_t (*devif_callback_event_t)(FAR struct net_driver_s *dev,
+typedef CODE uint32_t (*devif_callback_event_t)(FAR struct net_driver_s *dev,
                                                 FAR void *pvpriv,
-                                                uint16_t flags);
+                                                uint32_t flags);
 
 struct devif_callback_s
 {
@@ -278,7 +278,7 @@ struct devif_callback_s
   FAR struct devif_callback_s *nxtdev;
   FAR devif_callback_event_t event;
   FAR void *priv;
-  uint16_t flags;
+  uint32_t flags;
   uint8_t free_flags;
 };
 
@@ -386,7 +386,7 @@ void devif_dev_callback_free(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-uint16_t devif_conn_event(FAR struct net_driver_s *dev, uint16_t flags,
+uint32_t devif_conn_event(FAR struct net_driver_s *dev, uint32_t flags,
                           FAR struct devif_callback_s *list);
 
 /****************************************************************************
@@ -408,7 +408,7 @@ uint16_t devif_conn_event(FAR struct net_driver_s *dev, uint16_t flags,
  *
  ****************************************************************************/
 
-uint16_t devif_dev_event(FAR struct net_driver_s *dev, uint16_t flags);
+uint32_t devif_dev_event(FAR struct net_driver_s *dev, uint32_t flags);
 
 /****************************************************************************
  * Name: devif_send
diff --git a/net/devif/devif_callback.c b/net/devif/devif_callback.c
index f706ec638a5..271b897ee25 100644
--- a/net/devif/devif_callback.c
+++ b/net/devif/devif_callback.c
@@ -216,7 +216,7 @@ static void devif_callback_free(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-static bool devif_event_trigger(uint16_t events, uint16_t triggers)
+static bool devif_event_trigger(uint32_t events, uint32_t triggers)
 {
   /* The events are divided into a set of individual bits that may be ORed
    * together PLUS a field that encodes a single poll event.
@@ -451,7 +451,7 @@ void devif_dev_callback_free(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-uint16_t devif_conn_event(FAR struct net_driver_s *dev, uint16_t flags,
+uint32_t devif_conn_event(FAR struct net_driver_s *dev, uint32_t flags,
                           FAR struct devif_callback_s *list)
 {
   FAR struct devif_callback_s *next;
@@ -508,7 +508,7 @@ uint16_t devif_conn_event(FAR struct net_driver_s *dev, uint16_t flags,
  *
  ****************************************************************************/
 
-uint16_t devif_dev_event(FAR struct net_driver_s *dev, uint16_t flags)
+uint32_t devif_dev_event(FAR struct net_driver_s *dev, uint32_t flags)
 {
   FAR struct devif_callback_s *cb;
   FAR struct devif_callback_s *next;
diff --git a/net/icmp/icmp_netpoll.c b/net/icmp/icmp_netpoll.c
index 2966a077563..b326e87d167 100644
--- a/net/icmp/icmp_netpoll.c
+++ b/net/icmp/icmp_netpoll.c
@@ -63,15 +63,15 @@
  *
  ****************************************************************************/
 
-static uint16_t icmp_poll_eventhandler(FAR struct net_driver_s *dev,
-                                       FAR void *pvpriv, uint16_t flags)
+static uint32_t icmp_poll_eventhandler(FAR struct net_driver_s *dev,
+                                       FAR void *pvpriv, uint32_t flags)
 {
   FAR struct icmp_poll_s *info = pvpriv;
   FAR struct icmp_conn_s *conn;
   FAR struct socket *psock;
   pollevent_t eventset;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   DEBUGASSERT(info == NULL || info->fds != NULL);
 
diff --git a/net/icmp/icmp_recvmsg.c b/net/icmp/icmp_recvmsg.c
index f871931dda3..83ca75e5a6e 100644
--- a/net/icmp/icmp_recvmsg.c
+++ b/net/icmp/icmp_recvmsg.c
@@ -86,14 +86,14 @@ struct icmp_recvfrom_s
  *
  ****************************************************************************/
 
-static uint16_t recvfrom_eventhandler(FAR struct net_driver_s *dev,
-                                      FAR void *pvpriv, uint16_t flags)
+static uint32_t recvfrom_eventhandler(FAR struct net_driver_s *dev,
+                                      FAR void *pvpriv, uint32_t flags)
 {
   FAR struct icmp_recvfrom_s *pstate = pvpriv;
   FAR struct socket *psock;
   FAR struct ipv4_hdr_s *ipv4;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   if (pstate != NULL)
     {
diff --git a/net/icmp/icmp_sendmsg.c b/net/icmp/icmp_sendmsg.c
index dfced7f117e..659af82b1b3 100644
--- a/net/icmp/icmp_sendmsg.c
+++ b/net/icmp/icmp_sendmsg.c
@@ -173,12 +173,12 @@ static void sendto_request(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-static uint16_t sendto_eventhandler(FAR struct net_driver_s *dev,
-                                    FAR void *pvpriv, uint16_t flags)
+static uint32_t sendto_eventhandler(FAR struct net_driver_s *dev,
+                                    FAR void *pvpriv, uint32_t flags)
 {
   FAR struct icmp_sendto_s *pstate = pvpriv;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   if (pstate != NULL)
     {
diff --git a/net/icmpv6/icmpv6_autoconfig.c b/net/icmpv6/icmpv6_autoconfig.c
index 1da602bebf5..bb7f5412a1b 100644
--- a/net/icmpv6/icmpv6_autoconfig.c
+++ b/net/icmpv6/icmpv6_autoconfig.c
@@ -92,12 +92,12 @@ static void icmpv6_router_terminate(FAR struct icmpv6_router_s *state,
  * Name: icmpv6_router_eventhandler
  ****************************************************************************/
 
-static uint16_t icmpv6_router_eventhandler(FAR struct net_driver_s *dev,
-                                           FAR void *priv, uint16_t flags)
+static uint32_t icmpv6_router_eventhandler(FAR struct net_driver_s *dev,
+                                           FAR void *priv, uint32_t flags)
 {
   FAR struct icmpv6_router_s *state = (FAR struct icmpv6_router_s *)priv;
 
-  ninfo("flags: %04x sent: %d\n", flags, state->snd_sent);
+  ninfo("flags: %" PRIx32 " sent: %d\n", flags, state->snd_sent);
 
   if (state)
     {
diff --git a/net/icmpv6/icmpv6_neighbor.c b/net/icmpv6/icmpv6_neighbor.c
index 246d16e0b46..a689c8fb0fd 100644
--- a/net/icmpv6/icmpv6_neighbor.c
+++ b/net/icmpv6/icmpv6_neighbor.c
@@ -74,12 +74,12 @@ struct icmpv6_neighbor_s
  * Name: icmpv6_neighbor_eventhandler
  ****************************************************************************/
 
-static uint16_t icmpv6_neighbor_eventhandler(FAR struct net_driver_s *dev,
-                                             FAR void *priv, uint16_t flags)
+static uint32_t icmpv6_neighbor_eventhandler(FAR struct net_driver_s *dev,
+                                             FAR void *priv, uint32_t flags)
 {
   FAR struct icmpv6_neighbor_s *state = (FAR struct icmpv6_neighbor_s *)priv;
 
-  ninfo("flags: %04x sent: %d\n", flags, state->snd_sent);
+  ninfo("flags: %" PRIx32 " sent: %d\n", flags, state->snd_sent);
 
   if (state)
     {
diff --git a/net/icmpv6/icmpv6_netpoll.c b/net/icmpv6/icmpv6_netpoll.c
index a5984c459a9..c4fe1d0c475 100644
--- a/net/icmpv6/icmpv6_netpoll.c
+++ b/net/icmpv6/icmpv6_netpoll.c
@@ -63,15 +63,15 @@
  *
  ****************************************************************************/
 
-static uint16_t icmpv6_poll_eventhandler(FAR struct net_driver_s *dev,
-                                         FAR void *pvpriv, uint16_t flags)
+static uint32_t icmpv6_poll_eventhandler(FAR struct net_driver_s *dev,
+                                         FAR void *pvpriv, uint32_t flags)
 {
   FAR struct icmpv6_poll_s *info = pvpriv;
   FAR struct icmpv6_conn_s *conn;
   FAR struct socket *psock;
   pollevent_t eventset;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   DEBUGASSERT(info == NULL || info->fds != NULL);
 
diff --git a/net/icmpv6/icmpv6_recvmsg.c b/net/icmpv6/icmpv6_recvmsg.c
index d761fd3a49b..ff5a20ad390 100644
--- a/net/icmpv6/icmpv6_recvmsg.c
+++ b/net/icmpv6/icmpv6_recvmsg.c
@@ -94,13 +94,13 @@ struct icmpv6_recvfrom_s
  *
  ****************************************************************************/
 
-static uint16_t recvfrom_eventhandler(FAR struct net_driver_s *dev,
-                                      FAR void *pvpriv, uint16_t flags)
+static uint32_t recvfrom_eventhandler(FAR struct net_driver_s *dev,
+                                      FAR void *pvpriv, uint32_t flags)
 {
   FAR struct icmpv6_recvfrom_s *pstate = pvpriv;
   FAR struct ipv6_hdr_s *ipv6;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   if (pstate != NULL)
     {
diff --git a/net/icmpv6/icmpv6_sendmsg.c b/net/icmpv6/icmpv6_sendmsg.c
index fcab9fb80c5..3e076611311 100644
--- a/net/icmpv6/icmpv6_sendmsg.c
+++ b/net/icmpv6/icmpv6_sendmsg.c
@@ -170,12 +170,12 @@ static void sendto_request(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-static uint16_t sendto_eventhandler(FAR struct net_driver_s *dev,
-                                    FAR void *pvpriv, uint16_t flags)
+static uint32_t sendto_eventhandler(FAR struct net_driver_s *dev,
+                                    FAR void *pvpriv, uint32_t flags)
 {
   FAR struct icmpv6_sendto_s *pstate = pvpriv;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   if (pstate != NULL)
     {
diff --git a/net/ieee802154/ieee802154.h b/net/ieee802154/ieee802154.h
index e4feb519246..a5869dfa326 100644
--- a/net/ieee802154/ieee802154.h
+++ b/net/ieee802154/ieee802154.h
@@ -268,9 +268,9 @@ FAR struct ieee802154_conn_s *
  *
  ****************************************************************************/
 
-uint16_t ieee802154_callback(FAR struct radio_driver_s *radio,
+uint32_t ieee802154_callback(FAR struct radio_driver_s *radio,
                              FAR struct ieee802154_conn_s *conn,
-                             uint16_t flags);
+                             uint32_t flags);
 
 /****************************************************************************
  * Name: ieee802154_recvmsg
diff --git a/net/ieee802154/ieee802154_callback.c b/net/ieee802154/ieee802154_callback.c
index 5b0f8336a79..5d79d834130 100644
--- a/net/ieee802154/ieee802154_callback.c
+++ b/net/ieee802154/ieee802154_callback.c
@@ -55,11 +55,11 @@
  *
  ****************************************************************************/
 
-uint16_t ieee802154_callback(FAR struct radio_driver_s *radio,
+uint32_t ieee802154_callback(FAR struct radio_driver_s *radio,
                              FAR struct ieee802154_conn_s *conn,
-                             uint16_t flags)
+                             uint32_t flags)
 {
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   /* Some sanity checking */
 
diff --git a/net/ieee802154/ieee802154_recvmsg.c b/net/ieee802154/ieee802154_recvmsg.c
index 957c8660efb..1720390502b 100644
--- a/net/ieee802154/ieee802154_recvmsg.c
+++ b/net/ieee802154/ieee802154_recvmsg.c
@@ -206,15 +206,15 @@ static ssize_t
  *
  ****************************************************************************/
 
-static uint16_t
-  ieee802154_recvfrom_eventhandler(FAR struct net_driver_s *dev,
-                                   FAR void *pvpriv, uint16_t flags)
+static uint32_t
+ieee802154_recvfrom_eventhandler(FAR struct net_driver_s *dev,
+                                 FAR void *pvpriv, uint32_t flags)
 {
   FAR struct ieee802154_recvfrom_s *pstate;
   FAR struct radio_driver_s *radio;
   ssize_t ret;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   DEBUGASSERT(pvpriv != NULL && dev != NULL);
 
diff --git a/net/ieee802154/ieee802154_sendmsg.c b/net/ieee802154/ieee802154_sendmsg.c
index 90037873f0a..4531d1f30cf 100644
--- a/net/ieee802154/ieee802154_sendmsg.c
+++ b/net/ieee802154/ieee802154_sendmsg.c
@@ -270,9 +270,9 @@ static void ieee802154_meta_data(FAR struct radio_driver_s *radio,
  * Name: ieee802154_sendto_eventhandler
  ****************************************************************************/
 
-static uint16_t ieee802154_sendto_eventhandler(FAR struct net_driver_s *dev,
+static uint32_t ieee802154_sendto_eventhandler(FAR struct net_driver_s *dev,
                                                FAR void *pvpriv,
-                                               uint16_t flags)
+                                               uint32_t flags)
 {
   FAR struct radio_driver_s *radio;
   FAR struct ieee802154_sendto_s *pstate;
@@ -297,7 +297,7 @@ static uint16_t ieee802154_sendto_eventhandler(FAR struct net_driver_s *dev,
   pstate = pvpriv;
   radio  = (FAR struct radio_driver_s *)dev;
 
-  ninfo("flags: %04x sent: %zd\n", flags, pstate->is_sent);
+  ninfo("flags: %" PRIx32 " sent: %zd\n", flags, pstate->is_sent);
 
   if (pstate != NULL && (flags & IEEE802154_POLL) != 0)
     {
diff --git a/net/ipforward/ipfwd_forward.c b/net/ipforward/ipfwd_forward.c
index 11f748ff2dd..50e7deb1b5d 100644
--- a/net/ipforward/ipfwd_forward.c
+++ b/net/ipforward/ipfwd_forward.c
@@ -120,12 +120,12 @@ static inline void forward_ipselect(FAR struct forward_s *fwd)
  *
  ****************************************************************************/
 
-static uint16_t ipfwd_eventhandler(FAR struct net_driver_s *dev,
-                                   FAR void *pvpriv, uint16_t flags)
+static uint32_t ipfwd_eventhandler(FAR struct net_driver_s *dev,
+                                   FAR void *pvpriv, uint32_t flags)
 {
   FAR struct forward_s *fwd = pvpriv;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
   DEBUGASSERT(fwd != NULL && fwd->f_iob != NULL && fwd->f_dev != NULL);
 
   /* Make sure that this is from the forwarding device */
diff --git a/net/ipforward/ipfwd_poll.c b/net/ipforward/ipfwd_poll.c
index 46733092ed4..2add1f963a5 100644
--- a/net/ipforward/ipfwd_poll.c
+++ b/net/ipforward/ipfwd_poll.c
@@ -160,7 +160,7 @@ static void ipfwd_packet_conversion(FAR struct net_driver_s *dev, int proto)
 
 void ipfwd_poll(FAR struct net_driver_s *dev)
 {
-  uint16_t flags;
+  uint32_t flags;
 
   /* Setup for the callback (most of these do not apply) */
 
diff --git a/net/pkt/pkt.h b/net/pkt/pkt.h
index b4c90eefcba..3753d110093 100644
--- a/net/pkt/pkt.h
+++ b/net/pkt/pkt.h
@@ -245,8 +245,8 @@ void pkt_conn_list_unlock(void);
  *
  ****************************************************************************/
 
-uint16_t pkt_callback(FAR struct net_driver_s *dev,
-                      FAR struct pkt_conn_s *conn, uint16_t flags);
+uint32_t pkt_callback(FAR struct net_driver_s *dev,
+                      FAR struct pkt_conn_s *conn, uint32_t flags);
 
 /****************************************************************************
  * Name: pkt_input
diff --git a/net/pkt/pkt_callback.c b/net/pkt/pkt_callback.c
index 4b74c1d3b55..c3f6a8b0ae3 100644
--- a/net/pkt/pkt_callback.c
+++ b/net/pkt/pkt_callback.c
@@ -55,10 +55,10 @@
  *
  ****************************************************************************/
 
-uint16_t pkt_callback(FAR struct net_driver_s *dev,
-                      FAR struct pkt_conn_s *conn, uint16_t flags)
+uint32_t pkt_callback(FAR struct net_driver_s *dev,
+                      FAR struct pkt_conn_s *conn, uint32_t flags)
 {
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   /* Some sanity checking */
 
diff --git a/net/pkt/pkt_input.c b/net/pkt/pkt_input.c
index 58a06380f35..6edc2827d5e 100644
--- a/net/pkt/pkt_input.c
+++ b/net/pkt/pkt_input.c
@@ -160,7 +160,7 @@ static int pkt_in(FAR struct net_driver_s *dev)
   conn = pkt_active(dev);
   if (conn)
     {
-      uint16_t flags;
+      uint32_t flags;
 
       if (conn->pendiob == dev->d_iob)
         {
diff --git a/net/pkt/pkt_netpoll.c b/net/pkt/pkt_netpoll.c
index 5c52498efa9..2644f212ab3 100644
--- a/net/pkt/pkt_netpoll.c
+++ b/net/pkt/pkt_netpoll.c
@@ -98,12 +98,12 @@ static int psock_pkt_cansend(FAR struct pkt_conn_s *conn)
  *
  ****************************************************************************/
 
-static uint16_t pkt_poll_eventhandler(FAR struct net_driver_s *dev,
-                                      FAR void *pvpriv, uint16_t flags)
+static uint32_t pkt_poll_eventhandler(FAR struct net_driver_s *dev,
+                                      FAR void *pvpriv, uint32_t flags)
 {
   FAR struct pkt_poll_s *info = pvpriv;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   DEBUGASSERT(!info || (info->conn && info->fds));
 
diff --git a/net/pkt/pkt_recvmsg.c b/net/pkt/pkt_recvmsg.c
index 756b2e0ebb0..cd30728b1ea 100644
--- a/net/pkt/pkt_recvmsg.c
+++ b/net/pkt/pkt_recvmsg.c
@@ -217,12 +217,12 @@ static inline void pkt_recvfrom_sender(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-static uint16_t pkt_recvfrom_eventhandler(FAR struct net_driver_s *dev,
-                                          FAR void *pvpriv, uint16_t flags)
+static uint32_t pkt_recvfrom_eventhandler(FAR struct net_driver_s *dev,
+                                          FAR void *pvpriv, uint32_t flags)
 {
   struct pkt_recvfrom_s *pstate = pvpriv;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   /* 'priv' might be null in some race conditions (?) */
 
diff --git a/net/pkt/pkt_sendmsg_buffered.c b/net/pkt/pkt_sendmsg_buffered.c
index bc6481adaab..9bfc97fb6a2 100644
--- a/net/pkt/pkt_sendmsg_buffered.c
+++ b/net/pkt/pkt_sendmsg_buffered.c
@@ -82,8 +82,8 @@ static void pkt_sendbuffer_notify(FAR struct pkt_conn_s *conn)
  * Name: psock_send_eventhandler
  ****************************************************************************/
 
-static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
-                                        FAR void *pvpriv, uint16_t flags)
+static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev,
+                                        FAR void *pvpriv, uint32_t flags)
 {
   FAR struct pkt_conn_s *conn = pvpriv;
 
diff --git a/net/pkt/pkt_sendmsg_unbuffered.c b/net/pkt/pkt_sendmsg_unbuffered.c
index ab38974464b..afcbad3e314 100644
--- a/net/pkt/pkt_sendmsg_unbuffered.c
+++ b/net/pkt/pkt_sendmsg_unbuffered.c
@@ -78,12 +78,12 @@ struct send_s
  * Name: psock_send_eventhandler
  ****************************************************************************/
 
-static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
-                                        FAR void *pvpriv, uint16_t flags)
+static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev,
+                                        FAR void *pvpriv, uint32_t flags)
 {
   FAR struct send_s *pstate = pvpriv;
 
-  ninfo("flags: %04x sent: %zd\n", flags, pstate->snd_sent);
+  ninfo("flags: %" PRIx32 " sent: %zd\n", flags, pstate->snd_sent);
 
   if (pstate)
     {
diff --git a/net/sixlowpan/sixlowpan_send.c b/net/sixlowpan/sixlowpan_send.c
index 04696844888..d2d4230ddb0 100644
--- a/net/sixlowpan/sixlowpan_send.c
+++ b/net/sixlowpan/sixlowpan_send.c
@@ -99,12 +99,12 @@ struct sixlowpan_send_s
  *
  ****************************************************************************/
 
-static uint16_t send_eventhandler(FAR struct net_driver_s *dev,
-                                  FAR void *pvpriv, uint16_t flags)
+static uint32_t send_eventhandler(FAR struct net_driver_s *dev,
+                                  FAR void *pvpriv, uint32_t flags)
 {
   FAR struct sixlowpan_send_s *sinfo = pvpriv;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   /* Verify that this is a compatible network driver. */
 
diff --git a/net/sixlowpan/sixlowpan_tcpsend.c b/net/sixlowpan/sixlowpan_tcpsend.c
index 693cf7c75d3..26344b2ba91 100644
--- a/net/sixlowpan/sixlowpan_tcpsend.c
+++ b/net/sixlowpan/sixlowpan_tcpsend.c
@@ -302,8 +302,8 @@ static int sixlowpan_tcp_header(FAR struct tcp_conn_s *conn,
  *
  ****************************************************************************/
 
-static uint16_t tcp_send_eventhandler(FAR struct net_driver_s *dev,
-                                      FAR void *pvpriv, uint16_t flags)
+static uint32_t tcp_send_eventhandler(FAR struct net_driver_s *dev,
+                                      FAR void *pvpriv, uint32_t flags)
 {
   FAR struct sixlowpan_send_s *sinfo = pvpriv;
   FAR struct tcp_conn_s *conn = sinfo->s_conn;
@@ -339,7 +339,7 @@ static uint16_t tcp_send_eventhandler(FAR struct net_driver_s *dev,
       return flags;
     }
 
-  ninfo("flags: %04x acked: %" PRIu32 " sent: %zu\n",
+  ninfo("flags: %" PRIx32 " acked: %" PRIu32 " sent: %zu\n",
         flags, sinfo->s_acked, sinfo->s_sent);
 
   /* If this packet contains an acknowledgement, then update the count of
diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h
index 937f8afdb5b..35389a58949 100644
--- a/net/tcp/tcp.h
+++ b/net/tcp/tcp.h
@@ -806,7 +806,7 @@ int tcp_start_monitor(FAR struct socket *psock);
  *
  ****************************************************************************/
 
-void tcp_stop_monitor(FAR struct tcp_conn_s *conn, uint16_t flags);
+void tcp_stop_monitor(FAR struct tcp_conn_s *conn, uint32_t flags);
 
 /****************************************************************************
  * Name: tcp_lost_connection
@@ -832,7 +832,7 @@ void tcp_stop_monitor(FAR struct tcp_conn_s *conn, uint16_t flags);
  ****************************************************************************/
 
 void tcp_lost_connection(FAR struct tcp_conn_s *conn,
-                         FAR struct devif_callback_s *cb, uint16_t flags);
+                         FAR struct devif_callback_s *cb, uint32_t flags);
 
 /****************************************************************************
  * Name: tcp_close
@@ -1399,8 +1399,8 @@ void tcp_ipv6_input(FAR struct net_driver_s *dev, unsigned int iplen);
  *
  ****************************************************************************/
 
-uint16_t tcp_callback(FAR struct net_driver_s *dev,
-                      FAR struct tcp_conn_s *conn, uint16_t flags);
+uint32_t tcp_callback(FAR struct net_driver_s *dev,
+                      FAR struct tcp_conn_s *conn, uint32_t flags);
 
 /****************************************************************************
  * Name: tcp_datahandler
@@ -1939,7 +1939,7 @@ int tcp_wrbuffer_test(void);
 #ifdef CONFIG_DEBUG_FEATURES
 void tcp_event_handler_dump(FAR struct net_driver_s *dev,
                             FAR void *pvpriv,
-                            uint16_t flags,
+                            uint32_t flags,
                             FAR struct tcp_conn_s *conn);
 #endif
 
@@ -2381,7 +2381,7 @@ void tcp_cc_recv_ack(FAR struct tcp_conn_s *conn, FAR struct tcp_hdr_s *tcp);
  *
  ****************************************************************************/
 
-void tcp_set_zero_probe(FAR struct tcp_conn_s *conn, uint16_t flags);
+void tcp_set_zero_probe(FAR struct tcp_conn_s *conn, uint32_t flags);
 
 #endif /* NET_TCP_HAVE_STACK */
 #endif /* __NET_TCP_TCP_H */
diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c
index 8f9d5631e9c..2e8b561c7e4 100644
--- a/net/tcp/tcp_callback.c
+++ b/net/tcp/tcp_callback.c
@@ -60,9 +60,9 @@
  *
  ****************************************************************************/
 
-static inline uint16_t
+static inline uint32_t
 tcp_data_event(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
-               uint16_t flags)
+               uint32_t flags)
 {
   uint16_t recvlen;
 
@@ -109,9 +109,9 @@ tcp_data_event(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_TCP_OUT_OF_ORDER
-static uint16_t tcp_ofoseg_data_event(FAR struct net_driver_s *dev,
+static uint32_t tcp_ofoseg_data_event(FAR struct net_driver_s *dev,
                                       FAR struct tcp_conn_s *conn,
-                                      uint16_t flags)
+                                      uint32_t flags)
 {
   FAR struct tcp_ofoseg_s *seg;
   uint32_t rcvseq;
@@ -257,11 +257,11 @@ int tcp_ofoseg_bufsize(FAR struct tcp_conn_s *conn)
  *
  ****************************************************************************/
 
-uint16_t tcp_callback(FAR struct net_driver_s *dev,
-                      FAR struct tcp_conn_s *conn, uint16_t flags)
+uint32_t tcp_callback(FAR struct net_driver_s *dev,
+                      FAR struct tcp_conn_s *conn, uint32_t flags)
 {
 #if defined(CONFIG_NET_TCP_NOTIFIER) || defined(CONFIG_NET_TCP_OUT_OF_ORDER)
-  uint16_t orig = flags;
+  uint32_t orig = flags;
 #endif
 
   /* Prepare device buffer */
@@ -277,7 +277,7 @@ uint16_t tcp_callback(FAR struct net_driver_s *dev,
    * must be explicitly set in the callback.
    */
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   /* Perform the data callback.  When a data callback is executed from
    * 'list', the input flags are normally returned, however, the
diff --git a/net/tcp/tcp_close.c b/net/tcp/tcp_close.c
index 98568d1f2f8..4aa324819b6 100644
--- a/net/tcp/tcp_close.c
+++ b/net/tcp/tcp_close.c
@@ -70,12 +70,12 @@ static void tcp_close_work(FAR void *param)
  * Name: tcp_close_eventhandler
  ****************************************************************************/
 
-static uint16_t tcp_close_eventhandler(FAR struct net_driver_s *dev,
-                                       FAR void *pvpriv, uint16_t flags)
+static uint32_t tcp_close_eventhandler(FAR struct net_driver_s *dev,
+                                       FAR void *pvpriv, uint32_t flags)
 {
   FAR struct tcp_conn_s *conn = pvpriv;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   /* TCP_DISCONN_EVENTS:
    *   TCP_ABORT:    The remote host has aborted the connection
diff --git a/net/tcp/tcp_connect.c b/net/tcp/tcp_connect.c
index 3bba8132481..eb8ee1691b6 100644
--- a/net/tcp/tcp_connect.c
+++ b/net/tcp/tcp_connect.c
@@ -72,8 +72,8 @@ static inline int psock_setup_callbacks(FAR struct socket *psock,
                                         FAR struct tcp_connect_s *pstate);
 static void psock_teardown_callbacks(FAR struct tcp_connect_s *pstate,
                                      int status);
-static uint16_t psock_connect_eventhandler(FAR struct net_driver_s *dev,
-                                           FAR void *pvpriv, uint16_t flags);
+static uint32_t psock_connect_eventhandler(FAR struct net_driver_s *dev,
+                                           FAR void *pvpriv, uint32_t flags);
 
 /****************************************************************************
  * Private Functions
@@ -159,13 +159,13 @@ static void psock_teardown_callbacks(FAR struct tcp_connect_s *pstate,
  *
  ****************************************************************************/
 
-static uint16_t psock_connect_eventhandler(FAR struct net_driver_s *dev,
-                                           FAR void *pvpriv, uint16_t flags)
+static uint32_t psock_connect_eventhandler(FAR struct net_driver_s *dev,
+                                           FAR void *pvpriv, uint32_t flags)
 {
   struct tcp_connect_s *pstate = pvpriv;
   FAR struct tcp_conn_s *conn;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   /* 'priv' might be null in some race conditions (?) */
 
diff --git a/net/tcp/tcp_dump.c b/net/tcp/tcp_dump.c
index c273b394242..ccec9fc961c 100644
--- a/net/tcp/tcp_dump.c
+++ b/net/tcp/tcp_dump.c
@@ -50,12 +50,12 @@
 
 void tcp_event_handler_dump(FAR struct net_driver_s *dev,
                             FAR void *pvpriv,
-                            uint16_t flags,
+                            uint32_t flags,
                             FAR struct tcp_conn_s *conn)
 {
 #ifdef CONFIG_NET_TCP_WRITE_BUFFERS
   nerr("ERROR: conn->dev == NULL:"
-       " dev=%p pvpriv=%p flags=0x%04x"
+       " dev=%p pvpriv=%p flags=0x%" PRIx32
        " conn->dev=%p conn->flags=0x%04x tcpstateflags=0x%02x crefs=%d"
        " isn=%" PRIu32 " sndseq=%" PRIu32
        " tx_unacked=%" PRId32 " sent=%" PRId32
@@ -67,7 +67,7 @@ void tcp_event_handler_dump(FAR struct net_driver_s *dev,
        conn, conn->sconn.s_flags);
 #else
   nerr("ERROR: conn->dev == NULL:"
-       " dev=%p pvpriv=%p flags=0x%04x"
+       " dev=%p pvpriv=%p flags=0x%" PRIx32
        " conn->dev=%p conn->flags=0x%04x tcpstateflags=0x%02x crefs=%d"
        " sndseq=%" PRIu32
        " tx_unacked=%" PRId32
diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c
index ad8e880ab5e..74c8d53651d 100644
--- a/net/tcp/tcp_input.c
+++ b/net/tcp/tcp_input.c
@@ -696,8 +696,8 @@ static void tcp_input(FAR struct net_driver_s *dev, uint8_t domain,
   FAR struct tcp_hdr_s *tcp;
   union ip_binding_u uaddr;
   unsigned int tcpiplen;
+  uint32_t flags;
   uint16_t tmp16;
-  uint16_t flags;
   uint16_t result;
   int      len;
 
diff --git a/net/tcp/tcp_monitor.c b/net/tcp/tcp_monitor.c
index 2a559b32448..6c8271d585b 100644
--- a/net/tcp/tcp_monitor.c
+++ b/net/tcp/tcp_monitor.c
@@ -44,9 +44,9 @@
  ****************************************************************************/
 
 static void tcp_close_connection(FAR struct tcp_conn_s *conn,
-                                 uint16_t flags);
-static uint16_t tcp_monitor_event(FAR struct net_driver_s *dev,
-                                  FAR void *pvpriv, uint16_t flags);
+                                 uint32_t flags);
+static uint32_t tcp_monitor_event(FAR struct net_driver_s *dev,
+                                  FAR void *pvpriv, uint32_t flags);
 
 /****************************************************************************
  * Private Functions
@@ -70,7 +70,7 @@ static uint16_t tcp_monitor_event(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-static void tcp_close_connection(FAR struct tcp_conn_s *conn, uint16_t flags)
+static void tcp_close_connection(FAR struct tcp_conn_s *conn, uint32_t flags)
 {
   /* These loss-of-connection events may be reported:
    *
@@ -130,14 +130,15 @@ static void tcp_close_connection(FAR struct tcp_conn_s *conn, uint16_t flags)
  *
  ****************************************************************************/
 
-static uint16_t tcp_monitor_event(FAR struct net_driver_s *dev,
-                                  FAR void *pvpriv, uint16_t flags)
+static uint32_t tcp_monitor_event(FAR struct net_driver_s *dev,
+                                  FAR void *pvpriv, uint32_t flags)
 {
   FAR struct tcp_conn_s *conn = pvpriv;
 
   if (conn != NULL)
     {
-      ninfo("flags: %04x s_flags: %02x\n", flags, conn->sconn.s_flags);
+      ninfo("flags: %" PRIx32 " s_flags: %02x\n", flags,
+            conn->sconn.s_flags);
 
       /* TCP_DISCONN_EVENTS: TCP_ABORT, TCP_TIMEDOUT, or NETDEV_DOWN.
        * All loss-of-connection events.
@@ -205,7 +206,7 @@ static uint16_t tcp_monitor_event(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-static void tcp_shutdown_monitor(FAR struct tcp_conn_s *conn, uint16_t flags)
+static void tcp_shutdown_monitor(FAR struct tcp_conn_s *conn, uint32_t flags)
 {
   /* Perform callbacks to assure that all sockets, including dup'ed copies,
    * are informed of the loss of connection event.
@@ -335,7 +336,7 @@ int tcp_start_monitor(FAR struct socket *psock)
  *
  ****************************************************************************/
 
-void tcp_stop_monitor(FAR struct tcp_conn_s *conn, uint16_t flags)
+void tcp_stop_monitor(FAR struct tcp_conn_s *conn, uint32_t flags)
 {
   DEBUGASSERT(conn != NULL);
 
@@ -368,7 +369,7 @@ void tcp_stop_monitor(FAR struct tcp_conn_s *conn, uint16_t flags)
  ****************************************************************************/
 
 void tcp_lost_connection(FAR struct tcp_conn_s *conn,
-                         FAR struct devif_callback_s *cb, uint16_t flags)
+                         FAR struct devif_callback_s *cb, uint32_t flags)
 {
   DEBUGASSERT(conn != NULL);
 
diff --git a/net/tcp/tcp_netpoll.c b/net/tcp/tcp_netpoll.c
index 093ea200df9..2b1dad2094b 100644
--- a/net/tcp/tcp_netpoll.c
+++ b/net/tcp/tcp_netpoll.c
@@ -66,12 +66,12 @@
  *
  ****************************************************************************/
 
-static uint16_t tcp_poll_eventhandler(FAR struct net_driver_s *dev,
-                                      FAR void *pvpriv, uint16_t flags)
+static uint32_t tcp_poll_eventhandler(FAR struct net_driver_s *dev,
+                                      FAR void *pvpriv, uint32_t flags)
 {
   FAR struct tcp_poll_s *info = pvpriv;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   DEBUGASSERT(info == NULL || (info->conn != NULL && info->fds != NULL));
 
diff --git a/net/tcp/tcp_recvfrom.c b/net/tcp/tcp_recvfrom.c
index 45ab7c6594c..f7f6e44fac0 100644
--- a/net/tcp/tcp_recvfrom.c
+++ b/net/tcp/tcp_recvfrom.c
@@ -170,9 +170,9 @@ static size_t tcp_recvfrom_newdata(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-static inline uint16_t tcp_newdata(FAR struct net_driver_s *dev,
+static inline uint32_t tcp_newdata(FAR struct net_driver_s *dev,
                                    FAR struct tcp_recvfrom_s *pstate,
-                                   uint16_t flags)
+                                   uint32_t flags)
 {
   FAR struct tcp_conn_s *conn = pstate->ir_conn;
 
@@ -391,13 +391,13 @@ static inline void tcp_sender(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-static uint16_t tcp_recvhandler(FAR struct net_driver_s *dev,
-                                FAR void *pvpriv, uint16_t flags)
+static uint32_t tcp_recvhandler(FAR struct net_driver_s *dev,
+                                FAR void *pvpriv, uint32_t flags)
 {
   FAR struct tcp_recvfrom_s *pstate = pvpriv;
   FAR struct iob_s *iob = NULL;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   /* 'priv' might be null in some race conditions (?) */
 
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index bec10ee2681..68711453a8c 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -431,8 +431,8 @@ static int parse_sack(FAR struct tcp_conn_s *conn, FAR struct tcp_hdr_s *tcp,
  *
  ****************************************************************************/
 
-static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
-                                        FAR void *pvpriv, uint16_t flags)
+static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev,
+                                        FAR void *pvpriv, uint32_t flags)
 {
   FAR struct tcp_conn_s *conn = pvpriv;
 #ifdef CONFIG_NET_TCP_SELECTIVE_ACK
@@ -459,7 +459,7 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
       return flags;
     }
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   /* The TCP_ACKDATA, TCP_REXMIT and TCP_DISCONN_EVENTS flags are expected to
    * appear here strictly one at a time, except for the FIN + ACK case.
@@ -505,7 +505,7 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
       /* Get the ACK number from the TCP header */
 
       ackno = tcp_getsequence(tcp->ackno);
-      ninfo("ACK: ackno=%" PRIu32 " flags=%04x\n", ackno, flags);
+      ninfo("ACK: ackno=%" PRIu32 " flags=%" PRIx32 "\n", ackno, flags);
 
       /* Look at every write buffer in the unacked_q.  The unacked_q
        * holds write buffers that have been entirely sent, but which
@@ -707,7 +707,7 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
 
   if ((flags & TCP_DISCONN_EVENTS) != 0)
     {
-      ninfo("Lost connection: %04x\n", flags);
+      ninfo("Lost connection: %" PRIx32 "\n", flags);
 
       /* We could get here recursively through the callback actions of
        * tcp_lost_connection().  So don't repeat that action if we have
@@ -893,7 +893,7 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
       FAR struct tcp_wrbuffer_s *wrb;
       FAR sq_entry_t *entry;
 
-      ninfo("REXMIT: %04x\n", flags);
+      ninfo("REXMIT: %" PRIx32 "\n", flags);
 
       /* If there is a partially sent write buffer at the head of the
        * write_q?  Has anything been sent from that write buffer?
diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c
index 04477dc793d..fa5844b9866 100644
--- a/net/tcp/tcp_send_unbuffered.c
+++ b/net/tcp/tcp_send_unbuffered.c
@@ -125,8 +125,8 @@ struct send_s
  *
  ****************************************************************************/
 
-static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev,
-                                     FAR void *pvpriv, uint16_t flags)
+static uint32_t tcpsend_eventhandler(FAR struct net_driver_s *dev,
+                                     FAR void *pvpriv, uint32_t flags)
 {
   FAR struct send_s *pstate = pvpriv;
   FAR struct tcp_conn_s *conn;
@@ -151,7 +151,7 @@ static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev,
       return flags;
     }
 
-  ninfo("flags: %04x acked: %" PRId32 " sent: %zd\n",
+  ninfo("flags: %" PRIx32 " acked: %" PRId32 " sent: %zd\n",
         flags, pstate->snd_acked, pstate->snd_sent);
 
   /* The TCP_ACKDATA, TCP_REXMIT and TCP_DISCONN_EVENTS flags are expected to
diff --git a/net/tcp/tcp_sendfile.c b/net/tcp/tcp_sendfile.c
index 6b1a33776ec..429c6449f3f 100644
--- a/net/tcp/tcp_sendfile.c
+++ b/net/tcp/tcp_sendfile.c
@@ -117,8 +117,8 @@ struct sendfile_s
  *
  ****************************************************************************/
 
-static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev,
-                                      FAR void *pvpriv, uint16_t flags)
+static uint32_t sendfile_eventhandler(FAR struct net_driver_s *dev,
+                                      FAR void *pvpriv, uint32_t flags)
 {
   FAR struct sendfile_s *pstate = pvpriv;
   FAR struct tcp_conn_s *conn;
@@ -143,7 +143,7 @@ static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev,
       return flags;
     }
 
-  ninfo("flags: %04x acked: %" PRId32 " sent: %zd\n",
+  ninfo("flags: %" PRIx32 " acked: %" PRId32 " sent: %zd\n",
         flags, pstate->snd_acked, pstate->snd_sent);
 
   /* The TCP_ACKDATA, TCP_REXMIT and TCP_DISCONN_EVENTS flags are expected to
diff --git a/net/tcp/tcp_shutdown.c b/net/tcp/tcp_shutdown.c
index f29d57b4ae6..94426e26ab9 100644
--- a/net/tcp/tcp_shutdown.c
+++ b/net/tcp/tcp_shutdown.c
@@ -49,12 +49,12 @@
  * Name: tcp_shutdown_eventhandler
  ****************************************************************************/
 
-static uint16_t tcp_shutdown_eventhandler(FAR struct net_driver_s *dev,
-                                          FAR void *pvpriv, uint16_t flags)
+static uint32_t tcp_shutdown_eventhandler(FAR struct net_driver_s *dev,
+                                          FAR void *pvpriv, uint32_t flags)
 {
   FAR struct tcp_conn_s *conn = pvpriv;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
 #ifdef CONFIG_NET_TCP_WRITE_BUFFERS
   /* We don't need the send callback anymore. */
diff --git a/net/tcp/tcp_timer.c b/net/tcp/tcp_timer.c
index b86a1b38b86..5422616d407 100644
--- a/net/tcp/tcp_timer.c
+++ b/net/tcp/tcp_timer.c
@@ -364,7 +364,7 @@ void tcp_stop_timer(FAR struct tcp_conn_s *conn)
  *
  ****************************************************************************/
 
-void tcp_set_zero_probe(FAR struct tcp_conn_s *conn, uint16_t flags)
+void tcp_set_zero_probe(FAR struct tcp_conn_s *conn, uint32_t flags)
 {
   if ((conn->tcpstateflags & TCP_ESTABLISHED) &&
       ((flags & TCP_NEWDATA) == 0) && conn->tx_unacked <= 0 &&
diff --git a/net/udp/udp.h b/net/udp/udp.h
index ebfd5500468..68850022f65 100644
--- a/net/udp/udp.h
+++ b/net/udp/udp.h
@@ -729,8 +729,8 @@ udp_find_raddr_device(FAR struct udp_conn_s *conn,
  *
  ****************************************************************************/
 
-uint16_t udp_callback(FAR struct net_driver_s *dev,
-                      FAR struct udp_conn_s *conn, uint16_t flags);
+uint32_t udp_callback(FAR struct net_driver_s *dev,
+                      FAR struct udp_conn_s *conn, uint32_t flags);
 
 /****************************************************************************
  * Name: udp_callback_cleanup
diff --git a/net/udp/udp_callback.c b/net/udp/udp_callback.c
index 710bd95657e..7b363e3acd4 100644
--- a/net/udp/udp_callback.c
+++ b/net/udp/udp_callback.c
@@ -247,11 +247,11 @@ errout:
  *
  ****************************************************************************/
 
-static inline uint16_t
+static inline uint32_t
 net_dataevent(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn,
-              uint16_t flags)
+              uint32_t flags)
 {
-  uint16_t ret;
+  uint32_t ret;
   uint8_t *buffer = dev->d_appdata;
   int      buflen = dev->d_len;
   uint16_t recvlen;
@@ -306,10 +306,10 @@ net_dataevent(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn,
  *
  ****************************************************************************/
 
-uint16_t udp_callback(FAR struct net_driver_s *dev,
-                      FAR struct udp_conn_s *conn, uint16_t flags)
+uint32_t udp_callback(FAR struct net_driver_s *dev,
+                      FAR struct udp_conn_s *conn, uint32_t flags)
 {
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   /* Some sanity checking */
 
diff --git a/net/udp/udp_input.c b/net/udp/udp_input.c
index 22ec8a065e3..15534e37b97 100644
--- a/net/udp/udp_input.c
+++ b/net/udp/udp_input.c
@@ -138,7 +138,7 @@ static bool udp_is_broadcast(FAR struct net_driver_s *dev)
 static int udp_input_conn(FAR struct net_driver_s *dev,
                           FAR struct udp_conn_s *conn, unsigned int udpiplen)
 {
-  uint16_t flags;
+  uint32_t flags;
 
   /* Set-up for the application callback */
 
diff --git a/net/udp/udp_netpoll.c b/net/udp/udp_netpoll.c
index 213832b80c6..5a7333aaab7 100644
--- a/net/udp/udp_netpoll.c
+++ b/net/udp/udp_netpoll.c
@@ -64,12 +64,12 @@
  *
  ****************************************************************************/
 
-static uint16_t udp_poll_eventhandler(FAR struct net_driver_s *dev,
-                                      FAR void *pvpriv, uint16_t flags)
+static uint32_t udp_poll_eventhandler(FAR struct net_driver_s *dev,
+                                      FAR void *pvpriv, uint32_t flags)
 {
   FAR struct udp_poll_s *info = pvpriv;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   DEBUGASSERT(!info || (info->conn && info->fds));
 
diff --git a/net/udp/udp_recvfrom.c b/net/udp/udp_recvfrom.c
index a5d18d68e9f..38fbfda7829 100644
--- a/net/udp/udp_recvfrom.c
+++ b/net/udp/udp_recvfrom.c
@@ -440,12 +440,12 @@ static void udp_terminate(FAR struct udp_recvfrom_s *pstate, int result)
  *
  ****************************************************************************/
 
-static uint16_t udp_eventhandler(FAR struct net_driver_s *dev,
-                                 FAR void *pvpriv, uint16_t flags)
+static uint32_t udp_eventhandler(FAR struct net_driver_s *dev,
+                                 FAR void *pvpriv, uint32_t flags)
 {
   FAR struct udp_recvfrom_s *pstate = pvpriv;
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   /* 'priv' might be null in some race conditions (?) */
 
diff --git a/net/udp/udp_sendto_buffered.c b/net/udp/udp_sendto_buffered.c
index cfb28c6f0dc..194ce3c5dfd 100644
--- a/net/udp/udp_sendto_buffered.c
+++ b/net/udp/udp_sendto_buffered.c
@@ -94,8 +94,8 @@ static inline void sendto_ipselect(FAR struct net_driver_s *dev,
                                    FAR struct udp_conn_s *conn);
 #endif
 static int sendto_next_transfer(FAR struct udp_conn_s *conn);
-static uint16_t sendto_eventhandler(FAR struct net_driver_s *dev,
-                                    FAR void *pvpriv, uint16_t flags);
+static uint32_t sendto_eventhandler(FAR struct net_driver_s *dev,
+                                    FAR void *pvpriv, uint32_t flags);
 
 /****************************************************************************
  * Private Functions
@@ -386,20 +386,20 @@ out:
  *
  ****************************************************************************/
 
-static uint16_t sendto_eventhandler(FAR struct net_driver_s *dev,
-                                    FAR void *pvpriv, uint16_t flags)
+static uint32_t sendto_eventhandler(FAR struct net_driver_s *dev,
+                                    FAR void *pvpriv, uint32_t flags)
 {
   FAR struct udp_conn_s *conn = pvpriv;
 
   DEBUGASSERT(dev != NULL && conn != NULL);
 
-  ninfo("flags: %04x\n", flags);
+  ninfo("flags: %" PRIx32 "\n", flags);
 
   /* Check if the network device has gone down  */
 
   if ((flags & NETDEV_DOWN) != 0)
     {
-      ninfo("Device down: %04x\n", flags);
+      ninfo("Device down: %" PRIx32 "\n", flags);
 
       /* Free the write buffer at the head of the queue and attempt to setup
        * the next transfer.
diff --git a/net/udp/udp_sendto_unbuffered.c b/net/udp/udp_sendto_unbuffered.c
index 6e402a8064d..ffa190f6e2a 100644
--- a/net/udp/udp_sendto_unbuffered.c
+++ b/net/udp/udp_sendto_unbuffered.c
@@ -144,8 +144,8 @@ static inline void sendto_ipselect(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-static uint16_t sendto_eventhandler(FAR struct net_driver_s *dev,
-                                    FAR void *pvpriv, uint16_t flags)
+static uint32_t sendto_eventhandler(FAR struct net_driver_s *dev,
+                                    FAR void *pvpriv, uint32_t flags)
 {
   FAR struct sendto_s *pstate = pvpriv;
 
@@ -163,7 +163,7 @@ static uint16_t sendto_eventhandler(FAR struct net_driver_s *dev,
           return flags;
         }
 
-      ninfo("flags: %04x\n", flags);
+      ninfo("flags: %" PRIx32 "\n", flags);
 
       /* If the network device has gone down, then we will have terminate
        * the wait now with an error.
diff --git a/net/usrsock/usrsock.h b/net/usrsock/usrsock.h
index 200fb745da8..9f9e05f78a8 100644
--- a/net/usrsock/usrsock.h
+++ b/net/usrsock/usrsock.h
@@ -211,7 +211,7 @@ FAR struct usrsock_conn_s *usrsock_active(int16_t usockid);
 int usrsock_setup_request_callback(FAR struct usrsock_conn_s *conn,
                                    FAR struct usrsock_reqstate_s *pstate,
                                    FAR devif_callback_event_t event,
-                                   uint16_t flags);
+                                   uint32_t flags);
 
 /****************************************************************************
  * Name: usrsock_setup_data_request_callback()
@@ -220,7 +220,7 @@ int usrsock_setup_request_callback(FAR struct usrsock_conn_s *conn,
 int usrsock_setup_data_request_callback(FAR struct usrsock_conn_s *conn,
                                 FAR struct usrsock_data_reqstate_s *pstate,
                                 FAR devif_callback_event_t event,
-                                uint16_t flags);
+                                uint32_t flags);
 
 /****************************************************************************
  * Name: usrsock_teardown_request_callback()
diff --git a/net/usrsock/usrsock_accept.c b/net/usrsock/usrsock_accept.c
index 07e2f60adf9..880be40edbc 100644
--- a/net/usrsock/usrsock_accept.c
+++ b/net/usrsock/usrsock_accept.c
@@ -40,8 +40,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t accept_event(FAR struct net_driver_s *dev,
-                             FAR void *pvpriv, uint16_t flags)
+static uint32_t accept_event(FAR struct net_driver_s *dev,
+                             FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_data_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->reqstate.conn;
diff --git a/net/usrsock/usrsock_bind.c b/net/usrsock/usrsock_bind.c
index c0a74aafd7d..a0f163ace97 100644
--- a/net/usrsock/usrsock_bind.c
+++ b/net/usrsock/usrsock_bind.c
@@ -45,8 +45,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t bind_event(FAR struct net_driver_s *dev,
-                           FAR void *pvpriv, uint16_t flags)
+static uint32_t bind_event(FAR struct net_driver_s *dev,
+                           FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->conn;
diff --git a/net/usrsock/usrsock_close.c b/net/usrsock/usrsock_close.c
index c9a0cb7fe26..2dc38196f0a 100644
--- a/net/usrsock/usrsock_close.c
+++ b/net/usrsock/usrsock_close.c
@@ -45,8 +45,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t close_event(FAR struct net_driver_s *dev,
-                            FAR void *pvpriv, uint16_t flags)
+static uint32_t close_event(FAR struct net_driver_s *dev,
+                            FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->conn;
diff --git a/net/usrsock/usrsock_conn.c b/net/usrsock/usrsock_conn.c
index 52f9050d922..fd1e5325f8e 100644
--- a/net/usrsock/usrsock_conn.c
+++ b/net/usrsock/usrsock_conn.c
@@ -203,7 +203,7 @@ FAR struct usrsock_conn_s *usrsock_active(int16_t usockid)
 int usrsock_setup_request_callback(FAR struct usrsock_conn_s *conn,
                                    FAR struct usrsock_reqstate_s *pstate,
                                    FAR devif_callback_event_t event,
-                                   uint16_t flags)
+                                   uint32_t flags)
 {
   int ret = -EBUSY;
 
@@ -248,7 +248,7 @@ int usrsock_setup_data_request_callback(
       FAR struct usrsock_conn_s *conn,
       FAR struct usrsock_data_reqstate_s *pstate,
       FAR devif_callback_event_t event,
-      uint16_t flags)
+      uint32_t flags)
 {
   pstate->valuelen = 0;
   pstate->valuelen_nontrunc = 0;
diff --git a/net/usrsock/usrsock_connect.c b/net/usrsock/usrsock_connect.c
index 951b213e8b6..51237d3e102 100644
--- a/net/usrsock/usrsock_connect.c
+++ b/net/usrsock/usrsock_connect.c
@@ -45,8 +45,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t connect_event(FAR struct net_driver_s *dev,
-                              FAR void *pvpriv, uint16_t flags)
+static uint32_t connect_event(FAR struct net_driver_s *dev,
+                              FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->conn;
diff --git a/net/usrsock/usrsock_getpeername.c b/net/usrsock/usrsock_getpeername.c
index 4adb768df6a..94322bc2e4d 100644
--- a/net/usrsock/usrsock_getpeername.c
+++ b/net/usrsock/usrsock_getpeername.c
@@ -45,8 +45,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t getpeername_event(FAR struct net_driver_s *dev,
-                                  FAR void *pvpriv, uint16_t flags)
+static uint32_t getpeername_event(FAR struct net_driver_s *dev,
+                                  FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_data_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->reqstate.conn;
diff --git a/net/usrsock/usrsock_getsockname.c b/net/usrsock/usrsock_getsockname.c
index 679fa385b90..4947eb2d363 100644
--- a/net/usrsock/usrsock_getsockname.c
+++ b/net/usrsock/usrsock_getsockname.c
@@ -45,8 +45,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t getsockname_event(FAR struct net_driver_s *dev,
-                                  FAR void *pvpriv, uint16_t flags)
+static uint32_t getsockname_event(FAR struct net_driver_s *dev,
+                                  FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_data_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->reqstate.conn;
diff --git a/net/usrsock/usrsock_getsockopt.c b/net/usrsock/usrsock_getsockopt.c
index e01b2ad200e..2ddcb591fab 100644
--- a/net/usrsock/usrsock_getsockopt.c
+++ b/net/usrsock/usrsock_getsockopt.c
@@ -46,8 +46,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t getsockopt_event(FAR struct net_driver_s *dev,
-                                 FAR void *pvpriv, uint16_t flags)
+static uint32_t getsockopt_event(FAR struct net_driver_s *dev,
+                                 FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_data_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->reqstate.conn;
diff --git a/net/usrsock/usrsock_ioctl.c b/net/usrsock/usrsock_ioctl.c
index 06cd1aa2283..c80ab11fc91 100644
--- a/net/usrsock/usrsock_ioctl.c
+++ b/net/usrsock/usrsock_ioctl.c
@@ -47,8 +47,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t ioctl_event(FAR struct net_driver_s *dev,
-                            FAR void *pvpriv, uint16_t flags)
+static uint32_t ioctl_event(FAR struct net_driver_s *dev,
+                            FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_data_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->reqstate.conn;
diff --git a/net/usrsock/usrsock_listen.c b/net/usrsock/usrsock_listen.c
index fca51913bd9..2ce60844311 100644
--- a/net/usrsock/usrsock_listen.c
+++ b/net/usrsock/usrsock_listen.c
@@ -40,8 +40,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t listen_event(FAR struct net_driver_s *dev,
-                             FAR void *pvpriv, uint16_t flags)
+static uint32_t listen_event(FAR struct net_driver_s *dev,
+                             FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->conn;
diff --git a/net/usrsock/usrsock_poll.c b/net/usrsock/usrsock_poll.c
index 159b8a97a8f..8ee80097340 100644
--- a/net/usrsock/usrsock_poll.c
+++ b/net/usrsock/usrsock_poll.c
@@ -47,8 +47,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t poll_event(FAR struct net_driver_s *dev,
-                           FAR void *pvpriv, uint16_t flags)
+static uint32_t poll_event(FAR struct net_driver_s *dev,
+                           FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_poll_s *info = pvpriv;
   FAR struct usrsock_conn_s *conn = info->conn;
diff --git a/net/usrsock/usrsock_recvmsg.c b/net/usrsock/usrsock_recvmsg.c
index 67d34569170..a726827ed42 100644
--- a/net/usrsock/usrsock_recvmsg.c
+++ b/net/usrsock/usrsock_recvmsg.c
@@ -45,8 +45,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t recvfrom_event(FAR struct net_driver_s *dev,
-                               FAR void *pvpriv, uint16_t flags)
+static uint32_t recvfrom_event(FAR struct net_driver_s *dev,
+                               FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_data_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->reqstate.conn;
diff --git a/net/usrsock/usrsock_sendmsg.c b/net/usrsock/usrsock_sendmsg.c
index 8e86366ef63..084806c9318 100644
--- a/net/usrsock/usrsock_sendmsg.c
+++ b/net/usrsock/usrsock_sendmsg.c
@@ -45,8 +45,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t sendto_event(FAR struct net_driver_s *dev,
-                             FAR void *pvpriv, uint16_t flags)
+static uint32_t sendto_event(FAR struct net_driver_s *dev,
+                             FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->conn;
diff --git a/net/usrsock/usrsock_setsockopt.c b/net/usrsock/usrsock_setsockopt.c
index c065625769c..7baa9229676 100644
--- a/net/usrsock/usrsock_setsockopt.c
+++ b/net/usrsock/usrsock_setsockopt.c
@@ -46,8 +46,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t setsockopt_event(FAR struct net_driver_s *dev,
-                                 FAR void *pvpriv, uint16_t flags)
+static uint32_t setsockopt_event(FAR struct net_driver_s *dev,
+                                 FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->conn;
diff --git a/net/usrsock/usrsock_shutdown.c b/net/usrsock/usrsock_shutdown.c
index 7d50948cf90..d49e6c2cd35 100644
--- a/net/usrsock/usrsock_shutdown.c
+++ b/net/usrsock/usrsock_shutdown.c
@@ -45,8 +45,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t shutdown_event(FAR struct net_driver_s *dev,
-                               FAR void *pvpriv, uint16_t flags)
+static uint32_t shutdown_event(FAR struct net_driver_s *dev,
+                               FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->conn;
diff --git a/net/usrsock/usrsock_socket.c b/net/usrsock/usrsock_socket.c
index 167b007cfbf..abf9facae6a 100644
--- a/net/usrsock/usrsock_socket.c
+++ b/net/usrsock/usrsock_socket.c
@@ -46,8 +46,8 @@
  * Private Functions
  ****************************************************************************/
 
-static uint16_t socket_event(FAR struct net_driver_s *dev,
-                             FAR void *pvpriv, uint16_t flags)
+static uint32_t socket_event(FAR struct net_driver_s *dev,
+                             FAR void *pvpriv, uint32_t flags)
 {
   FAR struct usrsock_reqstate_s *pstate = pvpriv;
   FAR struct usrsock_conn_s *conn = pstate->conn;


(nuttx) 01/04: net: use netdev_lock to protect netdev_txnotify_dev

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit d377f6b7883d1f39ab9e056e41649a61a98286d4
Author: zhanghongyu <zh...@xiaomi.com>
AuthorDate: Fri Nov 14 17:53:20 2025 +0800

    net: use netdev_lock to protect netdev_txnotify_dev
    
    since the type of sconn lock is rmutex, there is no need to release
    sconn lock before TX
    
    Signed-off-by: zhanghongyu <zh...@xiaomi.com>
---
 net/arp/arp_send.c               |  4 ++--
 net/can/can_sendmsg.c            |  3 +--
 net/can/can_sendmsg_buffered.c   | 12 +++---------
 net/icmp/icmp_sendmsg.c          |  2 +-
 net/icmpv6/icmpv6_autoconfig.c   |  2 ++
 net/icmpv6/icmpv6_neighbor.c     |  4 ++++
 net/igmp/igmp_msg.c              |  2 ++
 net/igmp/igmp_timer.c            |  3 ---
 net/mld/mld_msg.c                |  2 ++
 net/mld/mld_timer.c              | 16 +++++++---------
 net/pkt/pkt_sendmsg_buffered.c   |  2 +-
 net/pkt/pkt_sendmsg_unbuffered.c |  3 +--
 net/tcp/tcp_connect.c            |  4 ++--
 net/tcp/tcp_recvfrom.c           |  2 ++
 net/tcp/tcp_send_buffered.c      |  2 +-
 net/tcp/tcp_sendfile.c           |  2 +-
 net/tcp/tcp_shutdown.c           |  2 --
 net/tcp/tcp_timer.c              |  2 ++
 net/udp/udp_sendto_buffered.c    | 12 +++++++-----
 net/udp/udp_sendto_unbuffered.c  |  3 +--
 20 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/net/arp/arp_send.c b/net/arp/arp_send.c
index 5bd032ef0d0..b56300578be 100644
--- a/net/arp/arp_send.c
+++ b/net/arp/arp_send.c
@@ -359,8 +359,6 @@ int arp_send(in_addr_t ipaddr)
       state.snd_cb->event = arp_send_eventhandler;
       state.finish_cb     = NULL;
 
-      netdev_unlock(dev);
-
       /* MAC address marked with all zeros to limit concurrent task
        * send ARP request for same destination.
        */
@@ -379,6 +377,8 @@ int arp_send(in_addr_t ipaddr)
        * net_sem_wait will also terminate if a signal is received.
        */
 
+      netdev_unlock(dev);
+
       do
         {
           ret = net_sem_timedwait_uninterruptible(&state.snd_sem,
diff --git a/net/can/can_sendmsg.c b/net/can/can_sendmsg.c
index 120eb7e8ada..373538a5d08 100644
--- a/net/can/can_sendmsg.c
+++ b/net/can/can_sendmsg.c
@@ -259,8 +259,6 @@ ssize_t can_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
       state.snd_cb->priv  = (FAR void *)&state;
       state.snd_cb->event = psock_send_eventhandler;
 
-      conn_dev_unlock(&conn->sconn, dev);
-
       /* Notify the device driver that new TX data is available. */
 
       netdev_txnotify_dev(dev);
@@ -269,6 +267,7 @@ ssize_t can_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
        * net_sem_timedwait will also terminate if a signal is received.
        */
 
+      conn_dev_unlock(&conn->sconn, dev);
       if (_SS_ISNONBLOCK(conn->sconn.s_flags) || (flags & MSG_DONTWAIT) != 0)
         {
           ret = net_sem_timedwait(&state.snd_sem, 0);
diff --git a/net/can/can_sendmsg_buffered.c b/net/can/can_sendmsg_buffered.c
index 523fcaab54c..09b8ca4d384 100644
--- a/net/can/can_sendmsg_buffered.c
+++ b/net/can/can_sendmsg_buffered.c
@@ -381,20 +381,14 @@ ssize_t can_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
       conn->sndcb->priv = (FAR void *)conn;
       conn->sndcb->event = psock_send_eventhandler;
 
-      /* unlock */
-
-      conn_dev_unlock(&conn->sconn, dev);
-
       /* Notify the device driver that new TX data is available. */
 
       netdev_txnotify_dev(dev);
     }
-    else
-    {
-      /* unlock */
 
-      conn_dev_unlock(&conn->sconn, dev);
-    }
+  /* unlock */
+
+  conn_dev_unlock(&conn->sconn, dev);
 
   return msg->msg_iov->iov_len;
 
diff --git a/net/icmp/icmp_sendmsg.c b/net/icmp/icmp_sendmsg.c
index 82da6cd8f82..dfced7f117e 100644
--- a/net/icmp/icmp_sendmsg.c
+++ b/net/icmp/icmp_sendmsg.c
@@ -403,13 +403,13 @@ ssize_t icmp_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
 
       /* Notify the device driver of the availability of TX data */
 
-      conn_dev_unlock(&conn->sconn, dev);
       netdev_txnotify_dev(dev);
 
       /* Wait for either the send to complete or for timeout to occur.
        * net_sem_timedwait will also terminate if a signal is received.
        */
 
+      conn_dev_unlock(&conn->sconn, dev);
       ret = net_sem_timedwait(&state.snd_sem,
                           _SO_TIMEOUT(conn->sconn.s_sndtimeo));
       conn_dev_lock(&conn->sconn, dev);
diff --git a/net/icmpv6/icmpv6_autoconfig.c b/net/icmpv6/icmpv6_autoconfig.c
index 8a8fcd6f9c5..1da602bebf5 100644
--- a/net/icmpv6/icmpv6_autoconfig.c
+++ b/net/icmpv6/icmpv6_autoconfig.c
@@ -231,11 +231,13 @@ static int icmpv6_send_message(FAR struct net_driver_s *dev, bool advertise)
    */
 
   netdev_unlock(dev);
+
   do
     {
       net_sem_wait(&state.snd_sem);
     }
   while (!state.snd_sent);
+
   netdev_lock(dev);
 
   ret = state.snd_result;
diff --git a/net/icmpv6/icmpv6_neighbor.c b/net/icmpv6/icmpv6_neighbor.c
index a899c196e71..246d16e0b46 100644
--- a/net/icmpv6/icmpv6_neighbor.c
+++ b/net/icmpv6/icmpv6_neighbor.c
@@ -342,6 +342,8 @@ int icmpv6_neighbor(FAR struct net_driver_s *dev,
        * net_sem_wait will also terminate if a signal is received.
        */
 
+      netdev_unlock(dev);
+
       do
         {
           net_sem_wait(&state.snd_sem);
@@ -354,6 +356,8 @@ int icmpv6_neighbor(FAR struct net_driver_s *dev,
 
       ret = icmpv6_wait(&notify, CONFIG_ICMPv6_NEIGHBOR_DELAYMSEC);
 
+      netdev_lock(dev);
+
       /* icmpv6_wait will return OK if and only if the matching Neighbor
        * Advertisement is received.  Otherwise, it will return -ETIMEDOUT.
        */
diff --git a/net/igmp/igmp_msg.c b/net/igmp/igmp_msg.c
index 9d46c3d70c4..ba044aeecfe 100644
--- a/net/igmp/igmp_msg.c
+++ b/net/igmp/igmp_msg.c
@@ -105,7 +105,9 @@ int igmp_schedmsg(FAR struct igmp_group_s *group, uint8_t msgid)
 
   /* Notify the device that we have a packet to send */
 
+  netdev_lock(dev);
   netdev_txnotify_dev(dev);
+  netdev_unlock(dev);
   return OK;
 }
 
diff --git a/net/igmp/igmp_timer.c b/net/igmp/igmp_timer.c
index b1187013965..4a2a0668f82 100644
--- a/net/igmp/igmp_timer.c
+++ b/net/igmp/igmp_timer.c
@@ -113,7 +113,6 @@ static void igmp_timeout_work(FAR void *arg)
    * the timer is cancelled before sending the IGMP_LEAVE_GROUP during leave.
    */
 
-  net_lock();
   if (!IS_IDLEMEMBER(group->flags))
     {
       /* Schedule (and forget) the Membership Report.  NOTE:
@@ -136,8 +135,6 @@ static void igmp_timeout_work(FAR void *arg)
        * once or twice after short delays [Unsolicited Report Interval]..."
        */
     }
-
-  net_unlock();
 }
 
 /****************************************************************************
diff --git a/net/mld/mld_msg.c b/net/mld/mld_msg.c
index 0b182ce7982..8b1d71ce40c 100644
--- a/net/mld/mld_msg.c
+++ b/net/mld/mld_msg.c
@@ -80,7 +80,9 @@ int mld_schedmsg(FAR struct mld_group_s *group, uint8_t msgtype)
 
   /* Notify the device that we have a packet to send */
 
+  netdev_lock(dev);
   netdev_txnotify_dev(dev);
+  netdev_unlock(dev);
   return OK;
 }
 
diff --git a/net/mld/mld_timer.c b/net/mld/mld_timer.c
index aab12951394..0556082c487 100644
--- a/net/mld/mld_timer.c
+++ b/net/mld/mld_timer.c
@@ -120,7 +120,6 @@ static void mld_gendog_work(FAR void *arg)
   ifindex = (intptr_t)arg;
   DEBUGASSERT(ifindex > 0);
 
-  net_lock();
   dev = netdev_findbyindex(ifindex);
   if (dev == NULL)
     {
@@ -133,6 +132,8 @@ static void mld_gendog_work(FAR void *arg)
       return;
     }
 
+  netdev_lock(dev);
+
   /* Check for an Other Querier Present Timeout.  This timer is set in non-
    * Querier mode to detect the case where we have lost the Querier.
    */
@@ -171,7 +172,7 @@ static void mld_gendog_work(FAR void *arg)
       mld_start_gentimer(dev, MSEC2TICK(MLD_OQUERY_MSEC));
     }
 
-  net_unlock();
+  netdev_unlock(dev);
 }
 
 /****************************************************************************
@@ -239,7 +240,6 @@ static void mld_v1dog_work(FAR void *arg)
   ifindex = (intptr_t)arg;
   DEBUGASSERT(ifindex > 0);
 
-  net_lock();
   dev = netdev_findbyindex(ifindex);
   if (dev == NULL)
     {
@@ -253,14 +253,14 @@ static void mld_v1dog_work(FAR void *arg)
     {
       /* Exit MLDv1 compatibility mode. */
 
+      netdev_lock(dev);
       CLR_MLD_V1COMPAT(dev->d_mld.flags);
+      netdev_unlock(dev);
 
       /* REVISIT:  Whenever a host changes its compatibility mode, it cancels
        * all of its pending responses and retransmission timers.
        */
     }
-
-  net_unlock();
 }
 
 /****************************************************************************
@@ -329,7 +329,6 @@ static void mld_polldog_work(FAR void *arg)
 
   /* Check if this a new join to the multicast group. */
 
-  net_lock();
   if (IS_MLD_STARTUP(group->flags))
     {
       MLD_STATINCR(g_netstats.mld.report_sched);
@@ -345,13 +344,14 @@ static void mld_polldog_work(FAR void *arg)
 
           fwarn("WARNING: No device associated with ifindex=%d\n",
                 group->ifindex);
-          net_unlock();
           return;
         }
 
       /* Schedule (and forget) the Report. */
 
+      netdev_lock(dev);
       ret = mld_schedmsg(group, mld_report_msgtype(dev));
+      netdev_unlock(dev);
       if (ret < 0)
         {
           mlderr("ERROR: Failed to schedule message: %d\n", ret);
@@ -375,8 +375,6 @@ static void mld_polldog_work(FAR void *arg)
           CLR_MLD_STARTUP(group->flags);
         }
     }
-
-  net_unlock();
 }
 
 /****************************************************************************
diff --git a/net/pkt/pkt_sendmsg_buffered.c b/net/pkt/pkt_sendmsg_buffered.c
index 8d6b9b43b9d..bc6481adaab 100644
--- a/net/pkt/pkt_sendmsg_buffered.c
+++ b/net/pkt/pkt_sendmsg_buffered.c
@@ -372,11 +372,11 @@ ssize_t pkt_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
       conn->sndcb->flags = PKT_POLL;
       conn->sndcb->priv  = conn;
       conn->sndcb->event = psock_send_eventhandler;
-      conn_dev_unlock(&conn->sconn, dev);
 
       /* Notify the device driver that new TX data is available. */
 
       netdev_txnotify_dev(dev);
+      conn_dev_unlock(&conn->sconn, dev);
     }
 
   return len;
diff --git a/net/pkt/pkt_sendmsg_unbuffered.c b/net/pkt/pkt_sendmsg_unbuffered.c
index 6715b4d5e58..ab38974464b 100644
--- a/net/pkt/pkt_sendmsg_unbuffered.c
+++ b/net/pkt/pkt_sendmsg_unbuffered.c
@@ -237,8 +237,6 @@ ssize_t pkt_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
           state.snd_cb->priv  = (FAR void *)&state;
           state.snd_cb->event = psock_send_eventhandler;
 
-          conn_dev_unlock(&conn->sconn, dev);
-
           /* Notify the device driver that new TX data is available. */
 
           netdev_txnotify_dev(dev);
@@ -247,6 +245,7 @@ ssize_t pkt_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
            * net_sem_wait will also terminate if a signal is received.
            */
 
+          conn_dev_unlock(&conn->sconn, dev);
           ret = net_sem_wait(&state.snd_sem);
           conn_dev_lock(&conn->sconn, dev);
 
diff --git a/net/tcp/tcp_connect.c b/net/tcp/tcp_connect.c
index 1c3a705c497..3bba8132481 100644
--- a/net/tcp/tcp_connect.c
+++ b/net/tcp/tcp_connect.c
@@ -376,8 +376,6 @@ int psock_tcp_connect(FAR struct socket *psock,
               info.tc_conn = conn;
               info.tc_cb = &state.tc_cb;
               info.tc_sem = &state.tc_sem;
-              conn_dev_unlock(&conn->sconn, conn->dev);
-              tls_cleanup_push(tls_get_info(), tcp_callback_cleanup, &info);
 
               /* Notify the device driver that new connection is available. */
 
@@ -389,6 +387,8 @@ int psock_tcp_connect(FAR struct socket *psock,
                * signal is received.
                */
 
+              conn_dev_unlock(&conn->sconn, conn->dev);
+              tls_cleanup_push(tls_get_info(), tcp_callback_cleanup, &info);
               ret = net_sem_wait(&state.tc_sem);
 
               tls_cleanup_pop(tls_get_info(), 0);
diff --git a/net/tcp/tcp_recvfrom.c b/net/tcp/tcp_recvfrom.c
index 010d3c753a9..45ab7c6594c 100644
--- a/net/tcp/tcp_recvfrom.c
+++ b/net/tcp/tcp_recvfrom.c
@@ -838,7 +838,9 @@ static ssize_t tcp_recvfrom_one(FAR struct tcp_conn_s *conn, FAR void *buf,
   if (tcp_should_send_recvwindow(conn))
     {
       conn_unlock(&conn->sconn);
+      netdev_lock(conn->dev);
       netdev_txnotify_dev(conn->dev);
+      netdev_unlock(conn->dev);
       conn_lock(&conn->sconn);
     }
 
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index 0c87dc287fe..bec10ee2681 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -1665,8 +1665,8 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
 
       /* Notify the device driver of the availability of TX data */
 
-      conn_dev_unlock(&conn->sconn, conn->dev);
       tcp_send_txnotify(psock, conn);
+      conn_dev_unlock(&conn->sconn, conn->dev);
 
       if (chunk_result == 0)
         {
diff --git a/net/tcp/tcp_sendfile.c b/net/tcp/tcp_sendfile.c
index 5c1ff7ee7d9..6b1a33776ec 100644
--- a/net/tcp/tcp_sendfile.c
+++ b/net/tcp/tcp_sendfile.c
@@ -515,12 +515,12 @@ ssize_t tcp_sendfile(FAR struct socket *psock, FAR struct file *infile,
                             TCP_DISCONN_EVENTS);
   state.snd_cb->priv     = (FAR void *)&state;
   state.snd_cb->event    = sendfile_eventhandler;
-  conn_dev_unlock(&conn->sconn, conn->dev);
 
   /* Notify the device driver of the availability of TX data */
 
   tcp_send_txnotify(psock, conn);
 
+  conn_dev_unlock(&conn->sconn, conn->dev);
   for (; ; )
     {
       uint32_t acked = state.snd_acked;
diff --git a/net/tcp/tcp_shutdown.c b/net/tcp/tcp_shutdown.c
index cf649509607..f29d57b4ae6 100644
--- a/net/tcp/tcp_shutdown.c
+++ b/net/tcp/tcp_shutdown.c
@@ -137,9 +137,7 @@ static inline int tcp_send_fin(FAR struct socket *psock)
 
       /* Notify the device driver of the availability of TX data */
 
-      conn_dev_unlock(&conn->sconn, conn->dev);
       tcp_send_txnotify(psock, conn);
-      return ret;
     }
 
 out:
diff --git a/net/tcp/tcp_timer.c b/net/tcp/tcp_timer.c
index c59360c4d1f..b86a1b38b86 100644
--- a/net/tcp/tcp_timer.c
+++ b/net/tcp/tcp_timer.c
@@ -154,7 +154,9 @@ static void tcp_timer_expiry(FAR void *arg)
         {
           tcp_conn_list_unlock();
           conn->timeout = true;
+          netdev_lock(conn->dev);
           netdev_txnotify_dev(conn->dev);
+          netdev_unlock(conn->dev);
           return;
         }
     }
diff --git a/net/udp/udp_sendto_buffered.c b/net/udp/udp_sendto_buffered.c
index e4cbef8cfaf..cfb28c6f0dc 100644
--- a/net/udp/udp_sendto_buffered.c
+++ b/net/udp/udp_sendto_buffered.c
@@ -248,6 +248,7 @@ static int sendto_next_transfer(FAR struct udp_conn_s *conn)
 {
   FAR struct udp_wrbuffer_s *wrb;
   FAR struct net_driver_s *dev;
+  int ret = OK;
 
   /* Set the UDP "connection" to the destination address of the write buffer
    * at the head of the queue.
@@ -329,11 +330,10 @@ static int sendto_next_transfer(FAR struct udp_conn_s *conn)
    * callback is not already in place.
    */
 
+  conn_dev_lock(&conn->sconn, dev);
   if (conn->sndcb == NULL)
     {
-      conn_dev_lock(&conn->sconn, dev);
       conn->sndcb = udp_callback_alloc(dev, conn);
-      conn_dev_unlock(&conn->sconn, dev);
     }
 
   /* Test if the callback has been allocated */
@@ -343,8 +343,8 @@ static int sendto_next_transfer(FAR struct udp_conn_s *conn)
       /* A buffer allocation error occurred */
 
       nerr("ERROR: Failed to allocate callback\n");
-      conn_lock(&conn->sconn);
-      return -ENOMEM;
+      ret = -ENOMEM;
+      goto out;
     }
 
   conn->dev = dev;
@@ -359,9 +359,11 @@ static int sendto_next_transfer(FAR struct udp_conn_s *conn)
 
   netdev_txnotify_dev(dev);
 
+out:
+  conn_dev_unlock(&conn->sconn, dev);
   conn_lock(&conn->sconn);
 
-  return OK;
+  return ret;
 }
 
 /****************************************************************************
diff --git a/net/udp/udp_sendto_unbuffered.c b/net/udp/udp_sendto_unbuffered.c
index f80aa1e9f48..6e402a8064d 100644
--- a/net/udp/udp_sendto_unbuffered.c
+++ b/net/udp/udp_sendto_unbuffered.c
@@ -475,8 +475,6 @@ ssize_t psock_udp_sendto(FAR struct socket *psock, FAR const void *buf,
       state.st_cb->priv    = (FAR void *)&state;
       state.st_cb->event   = sendto_eventhandler;
 
-      conn_dev_unlock(&conn->sconn, state.st_dev);
-
       /* Notify the device driver of the availability of TX data */
 
       netdev_txnotify_dev(state.st_dev);
@@ -486,6 +484,7 @@ ssize_t psock_udp_sendto(FAR struct socket *psock, FAR const void *buf,
        * is received.
        */
 
+      conn_dev_unlock(&conn->sconn, state.st_dev);
       ret = net_sem_timedwait(&state.st_sem,
                           _SO_TIMEOUT(conn->sconn.s_sndtimeo));
       if (ret >= 0)


(nuttx) 04/04: devif_poll.c: inline the small or single caller function

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 2f3b8255e02d84642c0a4ace383c0592f37c07bb
Author: zhanghongyu <zh...@xiaomi.com>
AuthorDate: Thu Nov 20 15:38:27 2025 +0800

    devif_poll.c: inline the small or single caller function
    
    reduce stack operations to lower CPU loading.
    
    Signed-off-by: zhanghongyu <zh...@xiaomi.com>
---
 net/devif/devif_poll.c | 67 ++++++++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/net/devif/devif_poll.c b/net/devif/devif_poll.c
index 0f1c865e4e1..777c31c7cc7 100644
--- a/net/devif/devif_poll.c
+++ b/net/devif/devif_poll.c
@@ -201,8 +201,9 @@ static void devif_packet_conversion(FAR struct net_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_IPFILTER
-static int devif_poll_local_out(FAR struct net_driver_s *dev,
-                                devif_poll_callback_t callback)
+static inline_function int
+devif_poll_local_out(FAR struct net_driver_s *dev,
+                     devif_poll_callback_t callback)
 {
   /* Maybe we need to reply REJECT to ourself, so filter before loopback. */
 
@@ -226,8 +227,9 @@ static int devif_poll_local_out(FAR struct net_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_PKT
-static int devif_poll_pkt_connections(FAR struct net_driver_s *dev,
-                                      devif_poll_callback_t callback)
+static inline_function int
+devif_poll_pkt_connections(FAR struct net_driver_s *dev,
+                           devif_poll_callback_t callback)
 {
   FAR struct pkt_conn_s *pkt_conn = NULL;
   int bstop = 0;
@@ -278,8 +280,9 @@ static int devif_poll_pkt_connections(FAR struct net_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_CAN
-static int devif_poll_can_connections(FAR struct net_driver_s *dev,
-                                      devif_poll_callback_t callback)
+static inline_function int
+devif_poll_can_connections(FAR struct net_driver_s *dev,
+                           devif_poll_callback_t callback)
 {
   FAR struct can_conn_s *can_conn = NULL;
   int bstop = 0;
@@ -326,8 +329,9 @@ static int devif_poll_can_connections(FAR struct net_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_BLUETOOTH
-static int devif_poll_bluetooth_connections(FAR struct net_driver_s *dev,
-                                            devif_poll_callback_t callback)
+static inline_function int
+devif_poll_bluetooth_connections(FAR struct net_driver_s *dev,
+                                 devif_poll_callback_t callback)
 {
   FAR struct bluetooth_conn_s *bluetooth_conn = NULL;
   int bstop = 0;
@@ -367,8 +371,9 @@ static int devif_poll_bluetooth_connections(FAR struct net_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_IEEE802154
-static int devif_poll_ieee802154_connections(FAR struct net_driver_s *dev,
-                                             devif_poll_callback_t callback)
+static inline_function int
+devif_poll_ieee802154_connections(FAR struct net_driver_s *dev,
+                                  devif_poll_callback_t callback)
 {
   FAR struct ieee802154_conn_s *ieee802154_conn = NULL;
   int bstop = 0;
@@ -404,8 +409,8 @@ static int devif_poll_ieee802154_connections(FAR struct net_driver_s *dev,
  ****************************************************************************/
 
 #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_SOCKET)
-static inline int devif_poll_icmp(FAR struct net_driver_s *dev,
-                                  devif_poll_callback_t callback)
+static inline_function int devif_poll_icmp(FAR struct net_driver_s *dev,
+                                           devif_poll_callback_t callback)
 {
   FAR struct icmp_conn_s *conn = NULL;
   int bstop = 0;
@@ -449,8 +454,8 @@ static inline int devif_poll_icmp(FAR struct net_driver_s *dev,
  ****************************************************************************/
 
 #if defined(CONFIG_NET_ICMPv6_SOCKET) || defined(CONFIG_NET_ICMPv6_NEIGHBOR)
-static inline int devif_poll_icmpv6(FAR struct net_driver_s *dev,
-                                    devif_poll_callback_t callback)
+static inline_function int devif_poll_icmpv6(FAR struct net_driver_s *dev,
+                                             devif_poll_callback_t callback)
 {
   FAR struct icmpv6_conn_s *conn = NULL;
   int bstop = 0;
@@ -497,8 +502,8 @@ static inline int devif_poll_icmpv6(FAR struct net_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_IPFORWARD
-static inline int devif_poll_forward(FAR struct net_driver_s *dev,
-                                     devif_poll_callback_t callback)
+static inline_function int devif_poll_forward(FAR struct net_driver_s *dev,
+                                              devif_poll_callback_t callback)
 {
   /* Perform the forwarding poll */
 
@@ -528,8 +533,8 @@ static inline int devif_poll_forward(FAR struct net_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_IGMP
-static inline int devif_poll_igmp(FAR struct net_driver_s *dev,
-                                  devif_poll_callback_t callback)
+static inline_function int devif_poll_igmp(FAR struct net_driver_s *dev,
+                                           devif_poll_callback_t callback)
 {
   /* Perform the IGMP TX poll */
 
@@ -558,8 +563,8 @@ static inline int devif_poll_igmp(FAR struct net_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_MLD
-static inline int devif_poll_mld(FAR struct net_driver_s *dev,
-                                 devif_poll_callback_t callback)
+static inline_function int devif_poll_mld(FAR struct net_driver_s *dev,
+                                          devif_poll_callback_t callback)
 {
   /* Perform the MLD TX poll */
 
@@ -588,8 +593,9 @@ static inline int devif_poll_mld(FAR struct net_driver_s *dev,
  ****************************************************************************/
 
 #ifdef NET_UDP_HAVE_STACK
-static int devif_poll_udp_connections(FAR struct net_driver_s *dev,
-                                      devif_poll_callback_t callback)
+static inline_function int
+devif_poll_udp_connections(FAR struct net_driver_s *dev,
+                           devif_poll_callback_t callback)
 {
   FAR struct udp_conn_s *conn = NULL;
   int bstop = 0;
@@ -639,8 +645,9 @@ static int devif_poll_udp_connections(FAR struct net_driver_s *dev,
  ****************************************************************************/
 
 #ifdef NET_TCP_HAVE_STACK
-static inline int devif_poll_tcp_connections(FAR struct net_driver_s *dev,
-                                             devif_poll_callback_t callback)
+static inline_function int
+devif_poll_tcp_connections(FAR struct net_driver_s *dev,
+                           devif_poll_callback_t callback)
 {
   FAR struct tcp_conn_s *conn  = NULL;
   int bstop = 0;
@@ -766,8 +773,8 @@ static int devif_poll_queue(FAR struct iob_queue_s *iobq,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_IPFRAG
-static int devif_poll_ipfrag(FAR struct net_driver_s *dev,
-                             devif_poll_callback_t callback)
+static inline_function int devif_poll_ipfrag(FAR struct net_driver_s *dev,
+                                             devif_poll_callback_t callback)
 {
   return devif_poll_queue(&dev->d_fragout, dev, callback);
 }
@@ -793,8 +800,8 @@ static int devif_poll_ipfrag(FAR struct net_driver_s *dev,
  ****************************************************************************/
 
 #if defined(CONFIG_NET_ARP_SEND_QUEUE) || defined(CONFIG_NET_ARP_SEND)
-static int devif_poll_arp(FAR struct net_driver_s *dev,
-                          devif_poll_callback_t callback)
+static inline_function int devif_poll_arp(FAR struct net_driver_s *dev,
+                                          devif_poll_callback_t callback)
 {
   int bstop;
 
@@ -1037,8 +1044,8 @@ static int devif_poll_connections(FAR struct net_driver_s *dev,
  *
  ****************************************************************************/
 
-static int devif_iob_poll(FAR struct net_driver_s *dev,
-                          devif_poll_callback_t callback)
+static inline_function int devif_iob_poll(FAR struct net_driver_s *dev,
+                                          devif_poll_callback_t callback)
 {
   int bstop;