diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-18 05:06:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-18 08:11:35 +0200 |
| commit | 9cbb7ecbcff85077bb12301aaf4c9b5a56c5993d (patch) | |
| tree | 585f03578c63503f81d03ba865207bdb9819d5c6 /net/ipv6/ndisc.c | |
| parent | neigh: Pass neighbour entry to output ops. (diff) | |
| download | linux-9cbb7ecbcff85077bb12301aaf4c9b5a56c5993d.tar.xz linux-9cbb7ecbcff85077bb12301aaf4c9b5a56c5993d.zip | |
ipv6: Get rid of rt6i_nexthop macro.
It just makes it harder to see 1) what the code is doing
and 2) grep for all users of dst{->,.}neighbour
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ndisc.c')
| -rw-r--r-- | net/ipv6/ndisc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index e08ce552d80b..a997d414f525 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -1238,7 +1238,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) rt = rt6_get_dflt_router(&ipv6_hdr(skb)->saddr, skb->dev); if (rt) - neigh = rt->rt6i_nexthop; + neigh = rt->dst.neighbour; if (rt && lifetime == 0) { neigh_clone(neigh); @@ -1259,7 +1259,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) return; } - neigh = rt->rt6i_nexthop; + neigh = rt->dst.neighbour; if (neigh == NULL) { ND_PRINTK0(KERN_ERR "ICMPv6 RA: %s() got default router without neighbour.\n", |