Commit a4477c4d authored by Li RongQing's avatar Li RongQing Committed by David S. Miller
Browse files

ipv6: remove rt6i_peer_genid from rt6_info and its handler 



6431cbc2(Create a mechanism for upward inetpeer propagation into routes)
introduces these codes, but this mechanism is never enabled since
rt6i_peer_genid always is zero whether it is not assigned or assigned by
rt6_peer_genid(). After 5943634f (ipv4: Maintain redirect and PMTU info
in struct rtable again), the ipv4 related codes of this mechanism has been
removed, I think we maybe able to remove them now.

Signed-off-by: default avatarLi RongQing <roy.qing.li@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f1e0b5b4

include/net/ip6_fib.h

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ struct rt6_info { 
	struct rt6key			rt6i_src;

	struct rt6key			rt6i_prefsrc;

	u32				rt6i_metric;

	u32				rt6i_peer_genid;



	struct inet6_dev		*rt6i_idev;

	unsigned long			_rt6i_peer;

net/ipv6/route.c

+2 −16
Original line number Diff line number Diff line
@@ -321,13 +321,6 @@ static void ip6_dst_destroy(struct dst_entry *dst) 
	}

}



static atomic_t __rt6_peer_genid = ATOMIC_INIT(0);



static u32 rt6_peer_genid(void)

{

	return atomic_read(&__rt6_peer_genid);

}



void rt6_bind_peer(struct rt6_info *rt, int create)

{

	struct inet_peer_base *base;
@@ -341,8 +334,6 @@ void rt6_bind_peer(struct rt6_info *rt, int create) 
	if (peer) {

		if (!rt6_set_peer(rt, peer))

			inet_putpeer(peer);

		else

			rt->rt6i_peer_genid = rt6_peer_genid();

	}

}
@@ -1099,14 +1090,9 @@ static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie) 
	if (rt->rt6i_genid != rt_genid(dev_net(rt->dst.dev)))

		return NULL;



	if (rt->rt6i_node && (rt->rt6i_node->fn_sernum == cookie)) {

		if (rt->rt6i_peer_genid != rt6_peer_genid()) {

			if (!rt6_has_peer(rt))

				rt6_bind_peer(rt, 0);

			rt->rt6i_peer_genid = rt6_peer_genid();

		}

	if (rt->rt6i_node && (rt->rt6i_node->fn_sernum == cookie))

		return dst;

	}



	return NULL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE