aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2013-10-16 05:49:04 -0400
committerDavid S. Miller <davem@davemloft.net>2013-10-17 16:11:04 -0400
commit0baf2b35fc70ab16c385963d2502da26a55d2cb7 (patch)
treef94f8bbb91aaf3ad1d7f0a8a342a83786e7ff12b
parenta5bb202b848c7962f942f81d93290a9ccdfb1a0f (diff)
ipv4: shrink rt_cache_stat
Half of the rt_cache_stat fields are no longer used after IP route cache removal, lets shrink this per cpu area. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/route.h8
-rw-r--r--net/ipv4/route.c16
2 files changed, 8 insertions, 16 deletions
diff --git a/include/net/route.h b/include/net/route.h
index 0ad8e0102386..dd4ae0029fd8 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -88,22 +88,14 @@ struct ip_rt_acct {
88}; 88};
89 89
90struct rt_cache_stat { 90struct rt_cache_stat {
91 unsigned int in_hit;
92 unsigned int in_slow_tot; 91 unsigned int in_slow_tot;
93 unsigned int in_slow_mc; 92 unsigned int in_slow_mc;
94 unsigned int in_no_route; 93 unsigned int in_no_route;
95 unsigned int in_brd; 94 unsigned int in_brd;
96 unsigned int in_martian_dst; 95 unsigned int in_martian_dst;
97 unsigned int in_martian_src; 96 unsigned int in_martian_src;
98 unsigned int out_hit;
99 unsigned int out_slow_tot; 97 unsigned int out_slow_tot;
100 unsigned int out_slow_mc; 98 unsigned int out_slow_mc;
101 unsigned int gc_total;
102 unsigned int gc_ignored;
103 unsigned int gc_goal_miss;
104 unsigned int gc_dst_overflow;
105 unsigned int in_hlist_search;
106 unsigned int out_hlist_search;
107}; 99};
108 100
109extern struct ip_rt_acct __percpu *ip_rt_acct; 101extern struct ip_rt_acct __percpu *ip_rt_acct;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 6011615e810d..d2d325382b13 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -295,7 +295,7 @@ static int rt_cpu_seq_show(struct seq_file *seq, void *v)
295 seq_printf(seq,"%08x %08x %08x %08x %08x %08x %08x %08x " 295 seq_printf(seq,"%08x %08x %08x %08x %08x %08x %08x %08x "
296 " %08x %08x %08x %08x %08x %08x %08x %08x %08x \n", 296 " %08x %08x %08x %08x %08x %08x %08x %08x %08x \n",
297 dst_entries_get_slow(&ipv4_dst_ops), 297 dst_entries_get_slow(&ipv4_dst_ops),
298 st->in_hit, 298 0, /* st->in_hit */
299 st->in_slow_tot, 299 st->in_slow_tot,
300 st->in_slow_mc, 300 st->in_slow_mc,
301 st->in_no_route, 301 st->in_no_route,
@@ -303,16 +303,16 @@ static int rt_cpu_seq_show(struct seq_file *seq, void *v)
303 st->in_martian_dst, 303 st->in_martian_dst,
304 st->in_martian_src, 304 st->in_martian_src,
305 305
306 st->out_hit, 306 0, /* st->out_hit */
307 st->out_slow_tot, 307 st->out_slow_tot,
308 st->out_slow_mc, 308 st->out_slow_mc,
309 309
310 st->gc_total, 310 0, /* st->gc_total */
311 st->gc_ignored, 311 0, /* st->gc_ignored */
312 st->gc_goal_miss, 312 0, /* st->gc_goal_miss */
313 st->gc_dst_overflow, 313 0, /* st->gc_dst_overflow */
314 st->in_hlist_search, 314 0, /* st->in_hlist_search */
315 st->out_hlist_search 315 0 /* st->out_hlist_search */
316 ); 316 );
317 return 0; 317 return 0;
318} 318}