]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
netns xfrm: xfrm_input() fixup
authorAlexey Dobriyan <adobriyan@gmail.com>
Wed, 26 Nov 2008 01:37:56 +0000 (17:37 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 26 Nov 2008 01:37:56 +0000 (17:37 -0800)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/xfrm/xfrm_input.c

index c08a93e98a36a20dc594ef2d77f5a785e30695b7..a714dce03dc4c2a8b0d796184084ee816b2a25a3 100644 (file)
@@ -104,6 +104,7 @@ EXPORT_SYMBOL(xfrm_prepare_input);
 
 int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
 {
+       struct net *net = dev_net(skb->dev);
        int err;
        __be32 seq;
        struct xfrm_state *x;
@@ -151,7 +152,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
                        goto drop;
                }
 
-               x = xfrm_state_lookup(&init_net, daddr, spi, nexthdr, family);
+               x = xfrm_state_lookup(net, daddr, spi, nexthdr, family);
                if (x == NULL) {
                        XFRM_INC_STATS(LINUX_MIB_XFRMINNOSTATES);
                        xfrm_audit_state_notfound(skb, family, spi, seq);