diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-25 20:37:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 20:37:56 -0500 |
commit | bd235e3cfff617ff91677da553714051866ba55f (patch) | |
tree | e719bd1b45c59b63abba02011b300d1b2ca08c36 /net/xfrm | |
parent | ddcfd79680c1dc74eb5f24aa70785c11bf7eec8f (diff) |
netns xfrm: xfrm_input() fixup
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
-rw-r--r-- | net/xfrm/xfrm_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index c08a93e98a36..a714dce03dc4 100644 --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c | |||
@@ -104,6 +104,7 @@ EXPORT_SYMBOL(xfrm_prepare_input); | |||
104 | 104 | ||
105 | int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) | 105 | int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) |
106 | { | 106 | { |
107 | struct net *net = dev_net(skb->dev); | ||
107 | int err; | 108 | int err; |
108 | __be32 seq; | 109 | __be32 seq; |
109 | struct xfrm_state *x; | 110 | struct xfrm_state *x; |
@@ -151,7 +152,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) | |||
151 | goto drop; | 152 | goto drop; |
152 | } | 153 | } |
153 | 154 | ||
154 | x = xfrm_state_lookup(&init_net, daddr, spi, nexthdr, family); | 155 | x = xfrm_state_lookup(net, daddr, spi, nexthdr, family); |
155 | if (x == NULL) { | 156 | if (x == NULL) { |
156 | XFRM_INC_STATS(LINUX_MIB_XFRMINNOSTATES); | 157 | XFRM_INC_STATS(LINUX_MIB_XFRMINNOSTATES); |
157 | xfrm_audit_state_notfound(skb, family, spi, seq); | 158 | xfrm_audit_state_notfound(skb, family, spi, seq); |