aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/netdevice.h5
-rw-r--r--net/core/dev.c10
-rw-r--r--net/core/sysctl_net_core.c1
3 files changed, 2 insertions, 14 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index d89816ad642f..c2e15e381a58 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -165,11 +165,6 @@ struct netif_rx_stats
165 unsigned dropped; 165 unsigned dropped;
166 unsigned time_squeeze; 166 unsigned time_squeeze;
167 unsigned throttled; 167 unsigned throttled;
168 unsigned fastroute_hit;
169 unsigned fastroute_success;
170 unsigned fastroute_defer;
171 unsigned fastroute_deferred_out;
172 unsigned fastroute_latency_reduction;
173 unsigned cpu_collision; 168 unsigned cpu_collision;
174}; 169};
175 170
diff --git a/net/core/dev.c b/net/core/dev.c
index ab935778ce81..4f1ae2efe872 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2056,14 +2056,8 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
2056 2056
2057 seq_printf(seq, "%08x %08x %08x %08x %08x %08x %08x %08x %08x\n", 2057 seq_printf(seq, "%08x %08x %08x %08x %08x %08x %08x %08x %08x\n",
2058 s->total, s->dropped, s->time_squeeze, s->throttled, 2058 s->total, s->dropped, s->time_squeeze, s->throttled,
2059 s->fastroute_hit, s->fastroute_success, s->fastroute_defer, 2059 0, 0, 0, 0, /* was fastroute */
2060 s->fastroute_deferred_out, 2060 s->cpu_collision );
2061#if 0
2062 s->fastroute_latency_reduction
2063#else
2064 s->cpu_collision
2065#endif
2066 );
2067 return 0; 2061 return 0;
2068} 2062}
2069 2063
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 880a88815211..76e9987474ca 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -18,7 +18,6 @@ extern int no_cong_thresh;
18extern int no_cong; 18extern int no_cong;
19extern int lo_cong; 19extern int lo_cong;
20extern int mod_cong; 20extern int mod_cong;
21extern int netdev_fastroute;
22extern int net_msg_cost; 21extern int net_msg_cost;
23extern int net_msg_burst; 22extern int net_msg_burst;
24 23