lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipv6: Get rid of rt6i_nexthop macro.

Browse Source 
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>
This commit is contained in:
David S. Miller
2011-07-17 20:06:13 -07:00
parent 8f40b161de
commit 9cbb7ecbcf
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv6/ndisc.c
View File

@@ -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",