diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-03 01:01:51 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-05 02:21:55 -0700 |
commit | 1d248b1cf4e09dbec8cef5f7fbeda5874248bd09 (patch) | |
tree | e65714ecde4e590dbadb01e94bd2cdbe5f3789c8 /net/ipv6 | |
parent | fccd7d5c77ff61d5283e7ce8242791d5f00dcc17 (diff) | |
download | linux-stable-1d248b1cf4e09dbec8cef5f7fbeda5874248bd09.tar.gz linux-stable-1d248b1cf4e09dbec8cef5f7fbeda5874248bd09.tar.bz2 linux-stable-1d248b1cf4e09dbec8cef5f7fbeda5874248bd09.zip |
net: Pass neighbours and dest address into NETEVENT_REDIRECT events.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/route.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 4b581c675bb2..34b29881e22d 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1687,6 +1687,7 @@ void rt6_redirect(const struct in6_addr *dest, const struct in6_addr *src, struct rt6_info *rt, *nrt = NULL; struct netevent_redirect netevent; struct net *net = dev_net(neigh->dev); + struct neighbour *old_neigh; rt = ip6_route_redirect(dest, src, saddr, neigh->dev); @@ -1714,7 +1715,8 @@ void rt6_redirect(const struct in6_addr *dest, const struct in6_addr *src, dst_confirm(&rt->dst); /* Duplicate redirect: silently ignore. */ - if (neigh == dst_get_neighbour_noref_raw(&rt->dst)) + old_neigh = dst_get_neighbour_noref_raw(&rt->dst); + if (neigh == old_neigh) goto out; nrt = ip6_rt_copy(rt, dest); @@ -1732,7 +1734,10 @@ void rt6_redirect(const struct in6_addr *dest, const struct in6_addr *src, goto out; netevent.old = &rt->dst; + netevent.old_neigh = old_neigh; netevent.new = &nrt->dst; + netevent.new_neigh = neigh; + netevent.daddr = dest; call_netevent_notifiers(NETEVENT_REDIRECT, &netevent); if (rt->rt6i_flags & RTF_CACHE) { |