diff options
Diffstat (limited to 'net/ipv6/ipcomp6.c')
-rw-r--r-- | net/ipv6/ipcomp6.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index 4545e4306862..3a0b3be7ece5 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c | |||
@@ -63,12 +63,12 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
63 | return; | 63 | return; |
64 | 64 | ||
65 | spi = htonl(ntohs(ipcomph->cpi)); | 65 | spi = htonl(ntohs(ipcomph->cpi)); |
66 | x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, spi, IPPROTO_COMP, AF_INET6); | 66 | x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, spi, IPPROTO_COMP, AF_INET6); |
67 | if (!x) | 67 | if (!x) |
68 | return; | 68 | return; |
69 | 69 | ||
70 | printk(KERN_DEBUG "pmtu discovery on SA IPCOMP/%08x/" NIP6_FMT "\n", | 70 | printk(KERN_DEBUG "pmtu discovery on SA IPCOMP/%08x/%pI6\n", |
71 | spi, NIP6(iph->daddr)); | 71 | spi, &iph->daddr); |
72 | xfrm_state_put(x); | 72 | xfrm_state_put(x); |
73 | } | 73 | } |
74 | 74 | ||
@@ -76,7 +76,7 @@ static struct xfrm_state *ipcomp6_tunnel_create(struct xfrm_state *x) | |||
76 | { | 76 | { |
77 | struct xfrm_state *t = NULL; | 77 | struct xfrm_state *t = NULL; |
78 | 78 | ||
79 | t = xfrm_state_alloc(); | 79 | t = xfrm_state_alloc(&init_net); |
80 | if (!t) | 80 | if (!t) |
81 | goto out; | 81 | goto out; |
82 | 82 | ||
@@ -114,7 +114,7 @@ static int ipcomp6_tunnel_attach(struct xfrm_state *x) | |||
114 | 114 | ||
115 | spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&x->props.saddr); | 115 | spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&x->props.saddr); |
116 | if (spi) | 116 | if (spi) |
117 | t = xfrm_state_lookup((xfrm_address_t *)&x->id.daddr, | 117 | t = xfrm_state_lookup(&init_net, (xfrm_address_t *)&x->id.daddr, |
118 | spi, IPPROTO_IPV6, AF_INET6); | 118 | spi, IPPROTO_IPV6, AF_INET6); |
119 | if (!t) { | 119 | if (!t) { |
120 | t = ipcomp6_tunnel_create(x); | 120 | t = ipcomp6_tunnel_create(x); |