diff options
author | David S. Miller | 2008-04-03 07:35:23 +0200 |
---|---|---|
committer | David S. Miller | 2008-04-03 07:35:23 +0200 |
commit | e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a (patch) | |
tree | 4e1ca325dde22f1ac21c9da0be509e87e922e604 /net/ipv6/netfilter | |
parent | [NETNS]: Do not include net/net_namespace.h from seq_file.h (diff) | |
parent | [VLAN]: Proc entry is not renamed when vlan device name changes. (diff) | |
download | kernel-qcow2-linux-e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a.tar.gz kernel-qcow2-linux-e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a.tar.xz kernel-qcow2-linux-e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/s2io.c
Diffstat (limited to 'net/ipv6/netfilter')
-rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 2 |
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 ad8066200f9d..9e5f305b2022 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/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) |