diff options
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r-- | net/ipv6/ip6_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 0981c1ef3057..6407c64ea4a5 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
@@ -411,7 +411,7 @@ int ip6_forward(struct sk_buff *skb) | |||
411 | struct inet6_skb_parm *opt = IP6CB(skb); | 411 | struct inet6_skb_parm *opt = IP6CB(skb); |
412 | struct net *net = dev_net(dst->dev); | 412 | struct net *net = dev_net(dst->dev); |
413 | 413 | ||
414 | if (ipv6_devconf.forwarding == 0) | 414 | if (net->ipv6.devconf_all->forwarding == 0) |
415 | goto error; | 415 | goto error; |
416 | 416 | ||
417 | if (skb_warn_if_lro(skb)) | 417 | if (skb_warn_if_lro(skb)) |
@@ -458,7 +458,7 @@ int ip6_forward(struct sk_buff *skb) | |||
458 | } | 458 | } |
459 | 459 | ||
460 | /* XXX: idev->cnf.proxy_ndp? */ | 460 | /* XXX: idev->cnf.proxy_ndp? */ |
461 | if (ipv6_devconf.proxy_ndp && | 461 | if (net->ipv6.devconf_all->proxy_ndp && |
462 | pneigh_lookup(&nd_tbl, net, &hdr->daddr, skb->dev, 0)) { | 462 | pneigh_lookup(&nd_tbl, net, &hdr->daddr, skb->dev, 0)) { |
463 | int proxied = ip6_forward_proxy_check(skb); | 463 | int proxied = ip6_forward_proxy_check(skb); |
464 | if (proxied > 0) | 464 | if (proxied > 0) |