aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ndisc.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/ndisc.c')
-rw-r--r--net/ipv6/ndisc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index b87f9d245e2e..b66a1f81bd83 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -789,7 +789,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
789 if (ipv6_chk_acast_addr(dev, &msg->target) || 789 if (ipv6_chk_acast_addr(dev, &msg->target) ||
790 (idev->cnf.forwarding && 790 (idev->cnf.forwarding &&
791 (ipv6_devconf.proxy_ndp || idev->cnf.proxy_ndp) && 791 (ipv6_devconf.proxy_ndp || idev->cnf.proxy_ndp) &&
792 (pneigh = pneigh_lookup(&nd_tbl, 792 (pneigh = pneigh_lookup(&nd_tbl, &init_net,
793 &msg->target, dev, 0)) != NULL)) { 793 &msg->target, dev, 0)) != NULL)) {
794 if (!(NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED) && 794 if (!(NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED) &&
795 skb->pkt_type != PACKET_HOST && 795 skb->pkt_type != PACKET_HOST &&
@@ -930,7 +930,7 @@ static void ndisc_recv_na(struct sk_buff *skb)
930 */ 930 */
931 if (lladdr && !memcmp(lladdr, dev->dev_addr, dev->addr_len) && 931 if (lladdr && !memcmp(lladdr, dev->dev_addr, dev->addr_len) &&
932 ipv6_devconf.forwarding && ipv6_devconf.proxy_ndp && 932 ipv6_devconf.forwarding && ipv6_devconf.proxy_ndp &&
933 pneigh_lookup(&nd_tbl, &msg->target, dev, 0)) { 933 pneigh_lookup(&nd_tbl, &init_net, &msg->target, dev, 0)) {
934 /* XXX: idev->cnf.prixy_ndp */ 934 /* XXX: idev->cnf.prixy_ndp */
935 goto out; 935 goto out;
936 } 936 }