Module Name: src
Committed By: dyoung
Date: Thu Apr 14 20:32:05 UTC 2011
Modified Files:
src/sys/netinet: ip_input.c
Log Message:
In ipintr(), don't overwrite ipintrq.ifq_maxlen with IFQ_MAXLEN.
Initialize ipintrq.ifq_maxlen using IFQ_MAXLEN directly instead of using
the global ipqmaxlen. Get rid of the global ipqmaxlen.
Now it works again to override the maximum IP queue length with, for
example, sysctl -w net.inet.ip.ifq.maxlen=5.
To generate a diff of this commit:
cvs rdiff -u -r1.293 -r1.294 src/sys/netinet/ip_input.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.293 src/sys/netinet/ip_input.c:1.294
--- src/sys/netinet/ip_input.c:1.293 Mon Dec 13 14:18:50 2010
+++ src/sys/netinet/ip_input.c Thu Apr 14 20:32:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.293 2010/12/13 14:18:50 matt Exp $ */
+/* $NetBSD: ip_input.c,v 1.294 2011/04/14 20:32:04 dyoung Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.293 2010/12/13 14:18:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.294 2011/04/14 20:32:04 dyoung Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -221,7 +221,6 @@
struct rttimer_queue *ip_mtudisc_timeout_q = NULL;
-int ipqmaxlen = IFQ_MAXLEN;
u_long in_ifaddrhash; /* size of hash table - 1 */
int in_ifaddrentries; /* total number of addrs */
struct in_ifaddrhead in_ifaddrhead;
@@ -319,7 +318,7 @@
ip_ids = ip_id_init();
ip_id = time_second & 0xfffff;
- ipintrq.ifq_maxlen = ipqmaxlen;
+ ipintrq.ifq_maxlen = IFQ_MAXLEN;
TAILQ_INIT(&in_ifaddrhead);
in_ifaddrhashtbl = hashinit(IN_IFADDR_HASH_SIZE, HASH_LIST, true,
@@ -366,7 +365,6 @@
struct ifqueue lcl_intrq;
memset(&lcl_intrq, 0, sizeof(lcl_intrq));
- ipintrq.ifq_maxlen = ipqmaxlen;
mutex_enter(softnet_lock);
KERNEL_LOCK(1, NULL);
