From owner-svn-src-projects@FreeBSD.ORG Sat May 30 20:43:04 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2EAA1065672; Sat, 30 May 2009 20:43:03 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D60978FC0A; Sat, 30 May 2009 20:43:03 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UKh3Ig018628; Sat, 30 May 2009 20:43:03 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4UKh3I9018619; Sat, 30 May 2009 20:43:03 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200905302043.n4UKh3I9018619@svn.freebsd.org> From: Robert Watson Date: Sat, 30 May 2009 20:43:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193116 - in projects/pnet/sys: net netatalk netinet netinet6 netipx netnatm X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 20:43:04 -0000 Author: rwatson Date: Sat May 30 20:43:03 2009 New Revision: 193116 URL: http://svn.freebsd.org/changeset/base/193116 Log: Where existing queue limits are IFQ_MAXLEN or similar-sounding numbers (50), use the netisr2 framework's default queue lengths. This is basically all network protocols using netisr except natm, which sets the limit to 1000. Modified: projects/pnet/sys/net/rtsock.c projects/pnet/sys/netatalk/ddp_usrreq.c projects/pnet/sys/netinet/if_ether.c projects/pnet/sys/netinet/igmp.c projects/pnet/sys/netinet/ip_input.c projects/pnet/sys/netinet6/ip6_input.c projects/pnet/sys/netinet6/vinet6.h projects/pnet/sys/netipx/ipx_input.c projects/pnet/sys/netnatm/natm_proto.c Modified: projects/pnet/sys/net/rtsock.c ============================================================================== --- projects/pnet/sys/net/rtsock.c Sat May 30 20:11:23 2009 (r193115) +++ projects/pnet/sys/net/rtsock.c Sat May 30 20:43:03 2009 (r193116) @@ -119,7 +119,6 @@ static struct netisr_handler rtsock_nh = .nh_name = "rtsock", .nh_handler = rts_input, .nh_proto = NETISR_ROUTE, - .nh_qlimit = 256, .nh_policy = NETISR_POLICY_SOURCE, }; Modified: projects/pnet/sys/netatalk/ddp_usrreq.c ============================================================================== --- projects/pnet/sys/netatalk/ddp_usrreq.c Sat May 30 20:11:23 2009 (r193115) +++ projects/pnet/sys/netatalk/ddp_usrreq.c Sat May 30 20:43:03 2009 (r193116) @@ -74,7 +74,6 @@ static const struct netisr_handler atalk .nh_name = "atalk1", .nh_handler = at1intr, .nh_proto = NETISR_ATALK1, - .nh_qlimit = IFQ_MAXLEN, .nh_policy = NETISR_POLICY_SOURCE, }; @@ -82,7 +81,6 @@ static const struct netisr_handler atalk .nh_name = "atalk2", .nh_handler = at2intr, .nh_proto = NETISR_ATALK2, - .nh_qlimit = IFQ_MAXLEN, .nh_policy = NETISR_POLICY_SOURCE, }; @@ -90,7 +88,6 @@ static const struct netisr_handler aarp_ .nh_name = "aarp", .nh_handler = aarpintr, .nh_proto = NETISR_AARP, - .nh_qlimit = IFQ_MAXLEN, .nh_policy = NETISR_POLICY_SOURCE, }; Modified: projects/pnet/sys/netinet/if_ether.c ============================================================================== --- projects/pnet/sys/netinet/if_ether.c Sat May 30 20:11:23 2009 (r193115) +++ projects/pnet/sys/netinet/if_ether.c Sat May 30 20:43:03 2009 (r193116) @@ -120,7 +120,6 @@ static const struct netisr_handler arp_n .nh_name = "arp", .nh_handler = arpintr, .nh_proto = NETISR_ARP, - .nh_qlimit = 50, .nh_policy = NETISR_POLICY_SOURCE, }; Modified: projects/pnet/sys/netinet/igmp.c ============================================================================== --- projects/pnet/sys/netinet/igmp.c Sat May 30 20:11:23 2009 (r193115) +++ projects/pnet/sys/netinet/igmp.c Sat May 30 20:43:03 2009 (r193116) @@ -148,7 +148,6 @@ static const struct netisr_handler igmp_ .nh_name = "igmp", .nh_handler = igmp_intr, .nh_proto = NETISR_IGMP, - .nh_qlimit = IFQ_MAXLEN, .nh_policy = NETISR_POLICY_SOURCE, }; Modified: projects/pnet/sys/netinet/ip_input.c ============================================================================== --- projects/pnet/sys/netinet/ip_input.c Sat May 30 20:11:23 2009 (r193115) +++ projects/pnet/sys/netinet/ip_input.c Sat May 30 20:43:03 2009 (r193116) @@ -170,7 +170,6 @@ static struct netisr_handler ip_nh = { .nh_handler = ip_input, .nh_m2flow = ip_input_m2flow, .nh_proto = NETISR_IP, - .nh_qlimit = IFQ_MAXLEN, .nh_policy = NETISR_POLICY_FLOW, }; Modified: projects/pnet/sys/netinet6/ip6_input.c ============================================================================== --- projects/pnet/sys/netinet6/ip6_input.c Sat May 30 20:11:23 2009 (r193115) +++ projects/pnet/sys/netinet6/ip6_input.c Sat May 30 20:43:03 2009 (r193116) @@ -125,7 +125,6 @@ static struct netisr_handler ip6_nh = { .nh_name = "ip6", .nh_handler = ip6_input, .nh_proto = NETISR_IPV6, - .nh_qlimit = IFQ_MAXLEN, .nh_policy = NETISR_POLICY_FLOW, }; @@ -136,7 +135,6 @@ struct vnet_inet6 vnet_inet6_0; #endif #ifdef VIMAGE_GLOBALS -static int ip6qmaxlen; struct in6_ifaddr *in6_ifaddr; struct ip6stat ip6stat; @@ -193,7 +191,6 @@ ip6_init(void) struct ip6protosw *pr; int i; - V_ip6qmaxlen = IFQ_MAXLEN; V_in6_maxmtu = 0; #ifdef IP6_AUTO_LINKLOCAL V_ip6_auto_linklocal = IP6_AUTO_LINKLOCAL; @@ -303,7 +300,6 @@ ip6_init(void) printf("%s: WARNING: unable to register pfil hook, " "error %d\n", __func__, i); - ip6_nh.nh_qlimit = V_ip6qmaxlen; netisr_register(&ip6_nh); } Modified: projects/pnet/sys/netinet6/vinet6.h ============================================================================== --- projects/pnet/sys/netinet6/vinet6.h Sat May 30 20:11:23 2009 (r193115) +++ projects/pnet/sys/netinet6/vinet6.h Sat May 30 20:43:03 2009 (r193116) @@ -118,7 +118,6 @@ struct vnet_inet6 { int _icmp6_nodeinfo; int _udp6_sendspace; int _udp6_recvspace; - int _ip6qmaxlen; int _ip6_prefer_tempaddr; int _nd6_prune; @@ -224,7 +223,6 @@ extern struct vnet_inet6 vnet_inet6_0; #define V_ip6_use_tempaddr VNET_INET6(ip6_use_tempaddr) #define V_ip6_v6only VNET_INET6(ip6_v6only) #define V_ip6q VNET_INET6(ip6q) -#define V_ip6qmaxlen VNET_INET6(ip6qmaxlen) #define V_ip6stat VNET_INET6(ip6stat) #define V_ip6stealth VNET_INET6(ip6stealth) #define V_llinfo_nd6 VNET_INET6(llinfo_nd6) Modified: projects/pnet/sys/netipx/ipx_input.c ============================================================================== --- projects/pnet/sys/netipx/ipx_input.c Sat May 30 20:11:23 2009 (r193115) +++ projects/pnet/sys/netipx/ipx_input.c Sat May 30 20:43:03 2009 (r193116) @@ -129,7 +129,6 @@ static struct netisr_handler ipx_nh = { .nh_name = "ipx", .nh_handler = ipxintr, .nh_proto = NETISR_IPX, - .nh_qlimit = IFQ_MAXLEN, .nh_policy = NETISR_POLICY_SOURCE, }; Modified: projects/pnet/sys/netnatm/natm_proto.c ============================================================================== --- projects/pnet/sys/netnatm/natm_proto.c Sat May 30 20:11:23 2009 (r193115) +++ projects/pnet/sys/netnatm/natm_proto.c Sat May 30 20:43:03 2009 (r193116) @@ -92,7 +92,7 @@ static struct netisr_handler natm_nh = { .nh_name = "natm", .nh_handler = natmintr, .nh_proto = NETISR_NATM, - .nh_qlimit = 1000 /* IFQ_MAXLEN */, + .nh_qlimit = 1000, .nh_policy = NETISR_POLICY_SOURCE, };