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

Commit ac3f48de authored by Steffen Klassert's avatar Steffen Klassert Committed by David S. Miller
Browse files

route: Remove redirect_genid 



As we invalidate the inetpeer tree along with the routing cache now,
we don't need a genid to reset the redirect handling when the routing
cache is flushed.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5faa5df1

include/net/inetpeer.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct inet_peer { 


	u32			metrics[RTAX_MAX];

	u32			rate_tokens;	/* rate limiting for ICMP */

	int			redirect_genid;

	unsigned long		rate_last;

	unsigned long		pmtu_expires;

	u32			pmtu_orig;

net/ipv4/inetpeer.c

+0 −1
Original line number Diff line number Diff line
@@ -498,7 +498,6 @@ relookup: 
		p->rate_last = 0;

		p->pmtu_expires = 0;

		p->pmtu_orig = 0;

		p->redirect_genid = 0;

		memset(&p->redirect_learned, 0, sizeof(p->redirect_learned));

		INIT_LIST_HEAD(&p->gc_list);

net/ipv4/route.c

+2 −9
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ static int ip_rt_mtu_expires __read_mostly = 10 * 60 * HZ; 
static int ip_rt_min_pmtu __read_mostly		= 512 + 20 + 20;

static int ip_rt_min_advmss __read_mostly	= 256;

static int rt_chain_length_max __read_mostly	= 20;

static int redirect_genid;



static struct delayed_work expires_work;

static unsigned long expires_ljiffies;
@@ -937,7 +936,6 @@ static void rt_cache_invalidate(struct net *net) 


	get_random_bytes(&shuffle, sizeof(shuffle));

	atomic_add(shuffle + 1U, &net->ipv4.rt_genid);

	redirect_genid++;

	inetpeer_invalidate_tree(AF_INET);

}
@@ -1486,10 +1484,8 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw, 


				peer = rt->peer;

				if (peer) {

					if (peer->redirect_learned.a4 != new_gw ||

					    peer->redirect_genid != redirect_genid) {

					if (peer->redirect_learned.a4 != new_gw) {

						peer->redirect_learned.a4 = new_gw;

						peer->redirect_genid = redirect_genid;

						atomic_inc(&__rt_peer_genid);

					}

					check_peer_redir(&rt->dst, peer);
@@ -1794,8 +1790,6 @@ static void ipv4_validate_peer(struct rtable *rt) 
		if (peer) {

			check_peer_pmtu(&rt->dst, peer);



			if (peer->redirect_genid != redirect_genid)

				peer->redirect_learned.a4 = 0;

			if (peer->redirect_learned.a4 &&

			    peer->redirect_learned.a4 != rt->rt_gateway)

				check_peer_redir(&rt->dst, peer);
@@ -1959,8 +1953,7 @@ static void rt_init_metrics(struct rtable *rt, const struct flowi4 *fl4, 
		dst_init_metrics(&rt->dst, peer->metrics, false);



		check_peer_pmtu(&rt->dst, peer);

		if (peer->redirect_genid != redirect_genid)

			peer->redirect_learned.a4 = 0;



		if (peer->redirect_learned.a4 &&

		    peer->redirect_learned.a4 != rt->rt_gateway) {

			rt->rt_gateway = peer->redirect_learned.a4;