mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-17 20:54:10 +00:00
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: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
926eae6044
commit
2d4feb2c1b
3 changed files with 1 additions and 7 deletions
|
@ -367,9 +367,8 @@ struct rt6_statistics {
|
||||||
__u32 fib_rt_cache; /* cached rt entries in exception table */
|
__u32 fib_rt_cache; /* cached rt entries in exception table */
|
||||||
__u32 fib_discarded_routes; /* total number of routes delete */
|
__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_alloc; /* total number of routes alloced */
|
||||||
atomic_t fib_rt_uncache; /* rt entries in uncached list */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#define RTN_TL_ROOT 0x0001
|
#define RTN_TL_ROOT 0x0001
|
||||||
|
|
|
@ -149,11 +149,9 @@ void rt6_uncached_list_del(struct rt6_info *rt)
|
||||||
{
|
{
|
||||||
if (!list_empty(&rt->rt6i_uncached)) {
|
if (!list_empty(&rt->rt6i_uncached)) {
|
||||||
struct uncached_list *ul = rt->rt6i_uncached_list;
|
struct uncached_list *ul = rt->rt6i_uncached_list;
|
||||||
struct net *net = dev_net(rt->dst.dev);
|
|
||||||
|
|
||||||
spin_lock_bh(&ul->lock);
|
spin_lock_bh(&ul->lock);
|
||||||
list_del(&rt->rt6i_uncached);
|
list_del(&rt->rt6i_uncached);
|
||||||
atomic_dec(&net->ipv6.rt6_stats->fib_rt_uncache);
|
|
||||||
spin_unlock_bh(&ul->lock);
|
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.
|
* if caller sets RT6_LOOKUP_F_DST_NOREF flag.
|
||||||
*/
|
*/
|
||||||
rt6_uncached_list_add(rt);
|
rt6_uncached_list_add(rt);
|
||||||
atomic_inc(&net->ipv6.rt6_stats->fib_rt_uncache);
|
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
|
|
||||||
return rt;
|
return rt;
|
||||||
|
@ -3287,7 +3284,6 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
|
||||||
* do proper release of the net_device
|
* do proper release of the net_device
|
||||||
*/
|
*/
|
||||||
rt6_uncached_list_add(rt);
|
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);
|
dst = xfrm_lookup(net, &rt->dst, flowi6_to_flowi(fl6), NULL, 0);
|
||||||
|
|
||||||
|
|
|
@ -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;
|
xdst->u.rt6.rt6i_src = rt->rt6i_src;
|
||||||
INIT_LIST_HEAD(&xdst->u.rt6.rt6i_uncached);
|
INIT_LIST_HEAD(&xdst->u.rt6.rt6i_uncached);
|
||||||
rt6_uncached_list_add(&xdst->u.rt6);
|
rt6_uncached_list_add(&xdst->u.rt6);
|
||||||
atomic_inc(&dev_net(dev)->ipv6.rt6_stats->fib_rt_uncache);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue