ipv6: Remove neigh argument from ndisc_send_redirect()

Instead, compute it as-needed inside of that function using
dst_neigh_lookup().

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index e3133c23980efbfccb7da335305815416e7d8ec0..6f9c25a76cd1328856293c1af4d9cf8b10188c1c 100644 (file)
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -133,7 +133,6 @@ extern void                 ndisc_send_rs(struct net_device *dev,
                                              const struct in6_addr *daddr);
 
 extern void                    ndisc_send_redirect(struct sk_buff *skb,
-                                                   struct neighbour *neigh,
                                                    const struct in6_addr *target);
 
 extern int                     ndisc_mc_map(const struct in6_addr *addr, char *buf,

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index d97e07183ce9c12123ece97e954004b912c88b30..604809b89b678679e3e8f4c90496f0fb758916a6 100644 (file)
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -486,7 +486,7 @@ int ip6_forward(struct sk_buff *skb)
                   and by source (inside ndisc_send_redirect)
                 */
                if (inet_peer_xrlim_allow(rt->rt6i_peer, 1*HZ))
-                       ndisc_send_redirect(skb, n, target);
+                       ndisc_send_redirect(skb, target);
        } else {
                int addrtype = ipv6_addr_type(&hdr->saddr);
 

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index c574ebce3fb5f3a83a06c08b088cf0c42b0c7a78..8d817018c188f2bb2c48d690f9a8169a7133a34b 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1512,8 +1512,7 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)
        }
 }
 
-void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
-                        const struct in6_addr *target)
+void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
 {
        struct net_device *dev = skb->dev;
        struct net *net = dev_net(dev);
@@ -1571,6 +1570,13 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
                goto release;
 
        if (dev->addr_len) {
+               struct neighbour *neigh = dst_neigh_lookup(skb_dst(skb), target);
+               if (!neigh) {
+                       ND_PRINTK2(KERN_WARNING
+                                  "ICMPv6 Redirect: no neigh for target address\n");
+                       goto release;
+               }
+
                read_lock_bh(&neigh->lock);
                if (neigh->nud_state & NUD_VALID) {
                        memcpy(ha_buf, neigh->ha, dev->addr_len);
@@ -1579,6 +1585,8 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
                        len += ndisc_opt_addr_space(dev);
                } else
                        read_unlock_bh(&neigh->lock);
+
+               neigh_release(neigh);
        }
 
        rd_len = min_t(unsigned int,