Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1918542 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent f83c7790

include/net/ip6_fib.h

+0 −3
Original line number Diff line number Diff line
@@ -86,9 +86,6 @@ struct fib6_table; 
struct rt6_info {

	struct dst_entry		dst;



#define rt6i_dev			dst.dev

#define rt6i_expires			dst.expires



	/*

	 * Tail elements of dst_entry (__refcnt etc.)

	 * and these elements (rarely used in hot path) are in

net/ipv6/addrconf.c

+4 −4
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp) 
				ip6_del_rt(rt);

				rt = NULL;

			} else if (!(rt->rt6i_flags & RTF_EXPIRES)) {

				rt->rt6i_expires = expires;

				rt->dst.expires = expires;

				rt->rt6i_flags |= RTF_EXPIRES;

			}

		}
@@ -1723,7 +1723,7 @@ static struct rt6_info *addrconf_get_prefix_route(const struct in6_addr *pfx, 
	if (!fn)

		goto out;

	for (rt = fn->leaf; rt; rt = rt->dst.rt6_next) {

		if (rt->rt6i_dev->ifindex != dev->ifindex)

		if (rt->dst.dev->ifindex != dev->ifindex)

			continue;

		if ((rt->rt6i_flags & flags) != flags)

			continue;
@@ -1881,11 +1881,11 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len) 
				rt = NULL;

			} else if (addrconf_finite_timeout(rt_expires)) {

				/* not infinity */

				rt->rt6i_expires = jiffies + rt_expires;

				rt->dst.expires = jiffies + rt_expires;

				rt->rt6i_flags |= RTF_EXPIRES;

			} else {

				rt->rt6i_flags &= ~RTF_EXPIRES;

				rt->rt6i_expires = 0;

				rt->dst.expires = 0;

			}

		} else if (valid_lft) {

			clock_t expires = 0;

net/ipv6/anycast.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr) 


		rt = rt6_lookup(net, addr, NULL, 0, 0);

		if (rt) {

			dev = rt->rt6i_dev;

			dev = rt->dst.dev;

			dst_release(&rt->dst);

		} else if (ishost) {

			err = -EADDRNOTAVAIL;

net/ipv6/ip6_fib.c

+5 −5
Original line number Diff line number Diff line
@@ -667,16 +667,16 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, 
				break;

			}



			if (iter->rt6i_dev == rt->rt6i_dev &&

			if (iter->dst.dev == rt->dst.dev &&

			    iter->rt6i_idev == rt->rt6i_idev &&

			    ipv6_addr_equal(&iter->rt6i_gateway,

					    &rt->rt6i_gateway)) {

				if (!(iter->rt6i_flags & RTF_EXPIRES))

					return -EEXIST;

				iter->rt6i_expires = rt->rt6i_expires;

				iter->dst.expires = rt->dst.expires;

				if (!(rt->rt6i_flags & RTF_EXPIRES)) {

					iter->rt6i_flags &= ~RTF_EXPIRES;

					iter->rt6i_expires = 0;

					iter->dst.expires = 0;

				}

				return -EEXIST;

			}
@@ -1521,8 +1521,8 @@ static int fib6_age(struct rt6_info *rt, void *arg) 
	 *	only if they are not in use now.

	 */



	if (rt->rt6i_flags & RTF_EXPIRES && rt->rt6i_expires) {

		if (time_after(now, rt->rt6i_expires)) {

	if (rt->rt6i_flags & RTF_EXPIRES && rt->dst.expires) {

		if (time_after(now, rt->dst.expires)) {

			RT6_TRACE("expiring %p\n", rt);

			return -1;

		}

net/ipv6/ip6_tunnel.c

+5 −5
Original line number Diff line number Diff line
@@ -653,8 +653,8 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
		rt = rt6_lookup(dev_net(skb->dev), &ipv6_hdr(skb2)->saddr,

				NULL, 0, 0);



		if (rt && rt->rt6i_dev)

			skb2->dev = rt->rt6i_dev;

		if (rt && rt->dst.dev)

			skb2->dev = rt->dst.dev;



		icmpv6_send(skb2, rel_type, rel_code, rel_info);
@@ -1185,11 +1185,11 @@ static void ip6_tnl_link_config(struct ip6_tnl *t) 
		if (rt == NULL)

			return;



		if (rt->rt6i_dev) {

			dev->hard_header_len = rt->rt6i_dev->hard_header_len +

		if (rt->dst.dev) {

			dev->hard_header_len = rt->dst.dev->hard_header_len +

				sizeof (struct ipv6hdr);



			dev->mtu = rt->rt6i_dev->mtu - sizeof (struct ipv6hdr);

			dev->mtu = rt->dst.dev->mtu - sizeof (struct ipv6hdr);

			if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))

				dev->mtu-=8;