diff options
author | David S. Miller <davem@davemloft.net> | 2011-12-28 20:19:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-28 20:19:20 -0500 |
commit | d191854282fd831da785a5a34bc6fd16049b8578 (patch) | |
tree | 2a2700b2dec7ad9e73c55c833346dbbd67b8777c /net/ipv6/ndisc.c | |
parent | f83c7790dc0025fffbd8684f3803a7571f624baa (diff) | |
download | linux-d191854282fd831da785a5a34bc6fd16049b8578.tar.bz2 |
ipv6: Kill rt6i_dev and rt6i_expires defines.
It just obscures that the netdevice pointer and the expires value are
implemented in the dst_entry sub-object of the ipv6 route.
And it makes grepping for dst_entry member uses much harder too.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ndisc.c')
-rw-r--r-- | net/ipv6/ndisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 538a61960a24..3b1fe4b3f3c6 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -1258,7 +1258,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) } if (rt) - rt->rt6i_expires = jiffies + (HZ * lifetime); + rt->dst.expires = jiffies + (HZ * lifetime); if (ra_msg->icmph.icmp6_hop_limit) { in6_dev->cnf.hop_limit = ra_msg->icmph.icmp6_hop_limit; |