From 0b64703cc7f5761829d192a144ca4318cd894944 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 28 Mar 2008 17:30:18 -0700 Subject: [PATCH] --- yaml --- r: 88017 b: refs/heads/master c: e8e16b706e8406f1ab3bccab16932ebc513896d8 h: refs/heads/master i: 88015: 4a2c5e188656e4c8f2351f1e9f4de7c331a5c140 v: v3 --- [refs] | 2 +- trunk/net/ipv4/inet_fragment.c | 3 +++ trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 41f6d99d479e..df2968b2051e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ef4730927c54cac5006759fa0cf50fbeff9d191 +refs/heads/master: e8e16b706e8406f1ab3bccab16932ebc513896d8 diff --git a/trunk/net/ipv4/inet_fragment.c b/trunk/net/ipv4/inet_fragment.c index 724d69aed031..a0a3c78cb5e0 100644 --- a/trunk/net/ipv4/inet_fragment.c +++ b/trunk/net/ipv4/inet_fragment.c @@ -86,7 +86,10 @@ EXPORT_SYMBOL(inet_frags_fini); void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f) { nf->low_thresh = 0; + + local_bh_disable(); inet_frag_evictor(nf, f); + local_bh_enable(); } EXPORT_SYMBOL(inet_frags_exit_net); diff --git a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c index 2a0d698b24d5..24c0d03095bf 100644 --- a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -171,7 +171,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_init_frags, &nf_frags); + local_bh_enable(); } static void nf_ct_frag6_expire(unsigned long data)