Author: ae
Date: Tue Apr 18 09:27:26 2017
New Revision: 317083
URL: https://svnweb.freebsd.org/changeset/base/317083

Log:
  MFC r316715:
    Make sysctl identifiers for direct netisr queue unique.
    Introduce IPCTL_INTRDQMAXLEN and IPCTL_INTRDQDROPS macros for this purpose.
  
    Reviewed by:        gnn
    Differential Revision:      https://reviews.freebsd.org/D10358

Modified:
  stable/11/sys/netinet/in.h
  stable/11/sys/netinet/ip_input.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/in.h
==============================================================================
--- stable/11/sys/netinet/in.h  Tue Apr 18 09:22:06 2017        (r317082)
+++ stable/11/sys/netinet/in.h  Tue Apr 18 09:27:26 2017        (r317083)
@@ -631,6 +631,8 @@ int getsourcefilter(int, uint32_t, struc
 #define        IPCTL_FASTFORWARDING    14      /* use fast IP forwarding code 
*/
                                        /* 15, unused, was: IPCTL_KEEPFAITH  */
 #define        IPCTL_GIF_TTL           16      /* default TTL for gif encap 
packet */
+#define        IPCTL_INTRDQMAXLEN      17      /* max length of direct netisr 
queue */
+#define        IPCTL_INTRDQDROPS       18      /* number of direct netisr q 
drops */
 
 #endif /* __BSD_VISIBLE */
 

Modified: stable/11/sys/netinet/ip_input.c
==============================================================================
--- stable/11/sys/netinet/ip_input.c    Tue Apr 18 09:22:06 2017        
(r317082)
+++ stable/11/sys/netinet/ip_input.c    Tue Apr 18 09:27:26 2017        
(r317083)
@@ -266,9 +266,9 @@ sysctl_netinet_intr_direct_queue_maxlen(
                return (EINVAL);
        return (netisr_setqlimit(&ip_direct_nh, qlimit));
 }
-SYSCTL_PROC(_net_inet_ip, IPCTL_INTRQMAXLEN, intr_direct_queue_maxlen,
-    CTLTYPE_INT|CTLFLAG_RW, 0, 0, sysctl_netinet_intr_direct_queue_maxlen, "I",
-    "Maximum size of the IP direct input queue");
+SYSCTL_PROC(_net_inet_ip, IPCTL_INTRDQMAXLEN, intr_direct_queue_maxlen,
+    CTLTYPE_INT|CTLFLAG_RW, 0, 0, sysctl_netinet_intr_direct_queue_maxlen,
+    "I", "Maximum size of the IP direct input queue");
 
 static int
 sysctl_netinet_intr_direct_queue_drops(SYSCTL_HANDLER_ARGS)
@@ -287,7 +287,7 @@ sysctl_netinet_intr_direct_queue_drops(S
        return (0);
 }
 
-SYSCTL_PROC(_net_inet_ip, IPCTL_INTRQDROPS, intr_direct_queue_drops,
+SYSCTL_PROC(_net_inet_ip, IPCTL_INTRDQDROPS, intr_direct_queue_drops,
     CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_netinet_intr_direct_queue_drops, "I",
     "Number of packets dropped from the IP direct input queue");
 #endif /* RSS */
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to