diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-26 02:37:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-26 02:37:56 +0100 |
| commit | bd235e3cfff617ff91677da553714051866ba55f (patch) | |
| tree | e719bd1b45c59b63abba02011b300d1b2ca08c36 /net | |
| parent | netns xfrm: dst garbage-collecting in netns (diff) | |
| download | linux-bd235e3cfff617ff91677da553714051866ba55f.tar.xz linux-bd235e3cfff617ff91677da553714051866ba55f.zip | |
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')
| -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); 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); |