diff --git a/net/devif/devif.h b/net/devif/devif.h
index 4b04460fbb7..e933c65001b 100644
--- a/net/devif/devif.h
+++ b/net/devif/devif.h
@@ -80,12 +80,38 @@
  *                        was last sent. (TCP only)
  *                   OUT: Not used
  *
- *   ARP_POLL        IN:  Used for polling the socket layer.  This is provided
- *   TCP_POLL             periodically from the drivers to support (1) timed
- *   UDP_POLL             operations, and (2) to check if the socket layer has
- *   PKT_POLL             data that it wants to send
- *   ICMP_POLL       OUT: Not used
- *   ICMPv6_POLL
+ *   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.
+ *                   OUT: Not used
+ *
+ *   ICMP_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 ICMP layer needs
+ *                        to send an ARP request.  This is a device oriented
+ *                        event, not associated with a socket.  This differs
+ *                        from ICMPv6_POLL only in that the appdata pointer
+ *                        is set differently
+ *                   OUT: Not used
+ *
+ *   ICMPv6_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 ICMP layer needs
+ *                        to send an ARP request.  This is a device oriented
+ *                        event, not associated with a socket.  This differs
+ *                        from ICMP_POLL only in that the appdata pointer
+ *                        is set differently
+ *                   OUT: Not used
+ *
+ *   TCP_POLL        IN:  Used for polling the socket layer.  This is provided
+ *   UDP_POLL             periodically from the drivers to support (1) timed
+ *   PKT_POLL             operations, and (2) to check if the socket layer has
+ *                        data that it wants to send.  These are socket oriented
+ *                        callbacks where the context depends on the specific
+ *                        set
+ *                   OUT: Not used
  *
  *   TCP_BACKLOG      IN: There is a new connection in the backlog list set
  *                        up by the listen() command. (TCP only)
@@ -115,11 +141,13 @@
  *                   OUT: Cleared (only) by the socket layer logic to indicate
  *                        that the reply was processed, suppressing further
  *                        attempts to process the reply.
+ *
  *   ICMPv6_ECHOREPLY IN: An ICMP Echo Reply has been received.  Used to support
  *                        ICMP ping from the socket layer. (ICMPv6 only)
  *                   OUT: Cleared (only) by the socket layer logic to indicate
  *                        that the reply was processed, suppressing further
  *                        attempts to process the reply.
+ *
  *   NETDEV_DOWN:     IN: The network device has been taken down.
  *                   OUT: Not used
  */
@@ -133,19 +161,19 @@
 #define TCP_SNDACK       (1 << 2)
 #define TCP_REXMIT       (1 << 3)
 #define ARP_POLL         (1 << 4)
-#define TCP_POLL         ARP_POLL
-#define UDP_POLL         ARP_POLL
-#define PKT_POLL         ARP_POLL
-#define ICMP_POLL        ARP_POLL
-#define ICMPv6_POLL      ARP_POLL
-#define TCP_BACKLOG      (1 << 5)
-#define TCP_CLOSE        (1 << 6)
-#define TCP_ABORT        (1 << 7)
-#define TCP_CONNECTED    (1 << 8)
-#define TCP_TIMEDOUT     (1 << 9)
-#define ICMP_ECHOREPLY   (1 << 10)
-#define ICMPv6_ECHOREPLY (1 << 11)
-#define NETDEV_DOWN      (1 << 12)
+#define ICMP_POLL        (1 << 5)
+#define ICMPv6_POLL      (1 << 6)
+#define TCP_POLL         (1 << 7)
+#define UDP_POLL         TCP_POLL
+#define PKT_POLL         TCP_POLL
+#define TCP_BACKLOG      (1 << 8)
+#define TCP_CLOSE        (1 << 9)
+#define TCP_ABORT        (1 << 10)
+#define TCP_CONNECTED    (1 << 11)
+#define TCP_TIMEDOUT     (1 << 12)
+#define ICMP_ECHOREPLY   (1 << 13)
+#define ICMPv6_ECHOREPLY (1 << 14)
+#define NETDEV_DOWN      (1 << 15)
 
 #define TCP_CONN_EVENTS (TCP_CLOSE | TCP_ABORT | TCP_CONNECTED | \
                          TCP_TIMEDOUT | NETDEV_DOWN)