summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-04-24 21:38:14 +0200
committerDavid S. Miller <davem@davemloft.net>2016-04-26 15:53:05 -0400
commitf0cdf76c103ffa34ca5ac87dcdef7edffc722cbf (patch)
tree893afe6a3b448bfeb0dd36cae35a6ce844230852 /net/core
parenta6086a893718db07ef9e7af5624ec27cb376ef0a (diff)
downloadlinux-f0cdf76c103ffa34ca5ac87dcdef7edffc722cbf.tar.gz
linux-f0cdf76c103ffa34ca5ac87dcdef7edffc722cbf.tar.bz2
linux-f0cdf76c103ffa34ca5ac87dcdef7edffc722cbf.zip
net: remove NETDEV_TX_LOCKED support
No more users in the tree, remove NETDEV_TX_LOCKED support. Adds another hole in softnet_stats struct, but better than keeping the unused collision counter around. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/net-procfs.c3
-rw-r--r--net/core/pktgen.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
index 2bf83299600a..14d09345f00d 100644
--- a/net/core/net-procfs.c
+++ b/net/core/net-procfs.c
@@ -162,7 +162,8 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
"%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x\n",
sd->processed, sd->dropped, sd->time_squeeze, 0,
0, 0, 0, 0, /* was fastroute */
- sd->cpu_collision, sd->received_rps, flow_limit_count);
+ 0, /* was cpu_collision */
+ sd->received_rps, flow_limit_count);
return 0;
}
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 20999aa596dd..8604ae245960 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3472,7 +3472,6 @@ xmit_more:
pkt_dev->odevname, ret);
pkt_dev->errors++;
/* fallthru */
- case NETDEV_TX_LOCKED:
case NETDEV_TX_BUSY:
/* Retry it next time */
atomic_dec(&(pkt_dev->skb->users));