summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2005-07-20 12:03:38 +0000
committerrwatson <rwatson@FreeBSD.org>2005-07-20 12:03:38 +0000
commit3495e52d0b72a6edb31efc9e980bc045fbd64efe (patch)
tree12aec2329313bc2050e9a1d9c0c3070449e469cb /sys/netinet
parentd558a17887f0684f969fe0e0706bc74d10a5e004 (diff)
downloadFreeBSD-src-3495e52d0b72a6edb31efc9e980bc045fbd64efe.zip
FreeBSD-src-3495e52d0b72a6edb31efc9e980bc045fbd64efe.tar.gz
Merge ip_input.c:1.302 from HEAD to RELENG_6:
Remove spl() calls from ip_slowtimo(), as IP fragment queue locking was merged several years ago. Approved by: re (kensmith)
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_input.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index c73aaaa..ff4b4be 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1125,7 +1125,6 @@ void
ip_slowtimo()
{
register struct ipq *fp;
- int s = splnet();
int i;
IPQ_LOCK();
@@ -1156,7 +1155,6 @@ ip_slowtimo()
}
}
IPQ_UNLOCK();
- splx(s);
}
/*
OpenPOWER on IntegriCloud