aboutsummaryrefslogtreecommitdiff
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 d89816ad642..c2e15e381a5 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -165,11 +165,6 @@ struct netif_rx_stats
unsigned dropped;
unsigned time_squeeze;
unsigned throttled;
- unsigned fastroute_hit;
- unsigned fastroute_success;
- unsigned fastroute_defer;
- unsigned fastroute_deferred_out;
- unsigned fastroute_latency_reduction;
unsigned cpu_collision;
};
diff --git a/net/core/dev.c b/net/core/dev.c
index ab935778ce8..4f1ae2efe87 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)
seq_printf(seq, "%08x %08x %08x %08x %08x %08x %08x %08x %08x\n",
s->total, s->dropped, s->time_squeeze, s->throttled,
- s->fastroute_hit, s->fastroute_success, s->fastroute_defer,
- s->fastroute_deferred_out,
-#if 0
- s->fastroute_latency_reduction
-#else
- s->cpu_collision
-#endif
- );
+ 0, 0, 0, 0, /* was fastroute */
+ s->cpu_collision );
return 0;
}
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 880a8881521..76e9987474c 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -18,7 +18,6 @@ extern int no_cong_thresh;
extern int no_cong;
extern int lo_cong;
extern int mod_cong;
-extern int netdev_fastroute;
extern int net_msg_cost;
extern int net_msg_burst;