Commit 2d4feb2c authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipv6: get rid of net->ipv6.rt6_stats->fib_rt_uncache 



This counter has never been visible, there is little point
trying to maintain it.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 926eae60

include/net/ip6_fib.h

+1 −2
Original line number Diff line number Diff line
@@ -367,9 +367,8 @@ struct rt6_statistics { 
	__u32		fib_rt_cache;		/* cached rt entries in exception table */

	__u32		fib_discarded_routes;	/* total number of routes delete */



	/* The following stats are not protected by any lock */

	/* The following stat is not protected by any lock */

	atomic_t	fib_rt_alloc;		/* total number of routes alloced */

	atomic_t	fib_rt_uncache;		/* rt entries in uncached list */

};



#define RTN_TL_ROOT	0x0001

net/ipv6/route.c

+0 −4
Original line number Diff line number Diff line
@@ -149,11 +149,9 @@ void rt6_uncached_list_del(struct rt6_info *rt) 
{

	if (!list_empty(&rt->rt6i_uncached)) {

		struct uncached_list *ul = rt->rt6i_uncached_list;

		struct net *net = dev_net(rt->dst.dev);



		spin_lock_bh(&ul->lock);

		list_del(&rt->rt6i_uncached);

		atomic_dec(&net->ipv6.rt6_stats->fib_rt_uncache);

		spin_unlock_bh(&ul->lock);

	}

}
@@ -2244,7 +2242,6 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, 
			 * if caller sets RT6_LOOKUP_F_DST_NOREF flag.

			 */

			rt6_uncached_list_add(rt);

			atomic_inc(&net->ipv6.rt6_stats->fib_rt_uncache);

			rcu_read_unlock();



			return rt;
@@ -3287,7 +3284,6 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev, 
	 * do proper release of the net_device

	 */

	rt6_uncached_list_add(rt);

	atomic_inc(&net->ipv6.rt6_stats->fib_rt_uncache);



	dst = xfrm_lookup(net, &rt->dst, flowi6_to_flowi(fl6), NULL, 0);

net/ipv6/xfrm6_policy.c

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, 
	xdst->u.rt6.rt6i_src = rt->rt6i_src;

	INIT_LIST_HEAD(&xdst->u.rt6.rt6i_uncached);

	rt6_uncached_list_add(&xdst->u.rt6);

	atomic_inc(&dev_net(dev)->ipv6.rt6_stats->fib_rt_uncache);



	return 0;

}