diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-25 17:30:50 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-25 17:30:50 -0800 |
| commit | 221df1ed33c9284fc7a6f6e47ca7f8d5f3665d43 (patch) | |
| tree | 1961ab9f9061b595e10449a24e7275d91f422de2 /net/ipv6/ipcomp6.c | |
| parent | 0e6024519b4da2d9413b97be1de8122d5709ccc1 (diff) | |
| download | kernel_samsung_smdk4412-221df1ed33c9284fc7a6f6e47ca7f8d5f3665d43.zip kernel_samsung_smdk4412-221df1ed33c9284fc7a6f6e47ca7f8d5f3665d43.tar.gz kernel_samsung_smdk4412-221df1ed33c9284fc7a6f6e47ca7f8d5f3665d43.tar.bz2 | |
netns xfrm: state lookup in netns
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ipcomp6.c')
| -rw-r--r-- | net/ipv6/ipcomp6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index c369638..3a0b3be 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c @@ -63,7 +63,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, return; spi = htonl(ntohs(ipcomph->cpi)); - x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, spi, IPPROTO_COMP, AF_INET6); + x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, spi, IPPROTO_COMP, AF_INET6); if (!x) return; @@ -114,7 +114,7 @@ static int ipcomp6_tunnel_attach(struct xfrm_state *x) spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&x->props.saddr); if (spi) - t = xfrm_state_lookup((xfrm_address_t *)&x->id.daddr, + t = xfrm_state_lookup(&init_net, (xfrm_address_t *)&x->id.daddr, spi, IPPROTO_IPV6, AF_INET6); if (!t) { t = ipcomp6_tunnel_create(x); |