Shan Wei wrote: > Introduce net namespace to conntrack and share netns_frags with IPv6 stack. > > Signed-off-by: Shan Wei <shanwei@xxxxxxxxxxxxxx> > --- > net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 7 +- > net/ipv6/netfilter/nf_conntrack_reasm.c | 79 +++++++----------------- > 2 files changed, 25 insertions(+), 61 deletions(-) > > diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c > index 996c3f4..f153b2c 100644 > --- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c > +++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c > @@ -221,7 +221,10 @@ static unsigned int ipv6_defrag(unsigned int hooknum, > if (skb->nfct && !nf_ct_is_template((struct nf_conn *)skb->nfct)) > return NF_ACCEPT; > > + local_bh_disable(); > reasm = nf_ct_frag6_gather(skb, nf_ct6_defrag_user(hooknum, skb)); > + local_bh_enable(); Please seperate any locking changes from the introduction of network namespaces. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
