Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-06 23:40:06 -0700
committerChris Wright <chrisw@sous-sol.org>2008-04-18 18:53:25 -0700
commitc6724ce3027b11151d39b4d19b85b9401462eebd (patch)
treea57e74e28b7f82e513c94607e9e6178b923cde14
parentd94e90a23b5f20d4aadf592d049a6de3c3260f07 (diff)
INET: inet_frag_evictor() must run with BH disabled
Part of upstream commit: e8e16b706e8406f1ab3bccab16932ebc513896d8 Based upon a lockdep trace from Dave Jones. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-rw-r--r--net/ipv6/netfilter/nf_conntrack_reasm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index e170c67c47a5..89f95f9c7a8c 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -147,7 +147,9 @@ static __inline__ void fq_kill(struct nf_ct_frag6_queue *fq)
static void nf_ct_frag6_evictor(void)
{
+ local_bh_disable();
inet_frag_evictor(&nf_frags);
+ local_bh_enable();
}
static void nf_ct_frag6_expire(unsigned long data)