aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/mcast.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-12-28 20:19:20 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-28 20:19:20 -0500
commitd191854282fd831da785a5a34bc6fd16049b8578 (patch)
tree2a2700b2dec7ad9e73c55c833346dbbd67b8777c /net/ipv6/mcast.c
parentf83c7790dc0025fffbd8684f3803a7571f624baa (diff)
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/mcast.c')
-rw-r--r--net/ipv6/mcast.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index ea34d58e836d..b853f06cc148 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -162,7 +162,7 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
162 struct rt6_info *rt; 162 struct rt6_info *rt;
163 rt = rt6_lookup(net, addr, NULL, 0, 0); 163 rt = rt6_lookup(net, addr, NULL, 0, 0);
164 if (rt) { 164 if (rt) {
165 dev = rt->rt6i_dev; 165 dev = rt->dst.dev;
166 dst_release(&rt->dst); 166 dst_release(&rt->dst);
167 } 167 }
168 } else 168 } else
@@ -256,7 +256,7 @@ static struct inet6_dev *ip6_mc_find_dev_rcu(struct net *net,
256 struct rt6_info *rt = rt6_lookup(net, group, NULL, 0, 0); 256 struct rt6_info *rt = rt6_lookup(net, group, NULL, 0, 0);
257 257
258 if (rt) { 258 if (rt) {
259 dev = rt->rt6i_dev; 259 dev = rt->dst.dev;
260 dev_hold(dev); 260 dev_hold(dev);
261 dst_release(&rt->dst); 261 dst_release(&rt->dst);
262 } 262 }