diff options
author | Florian Westphal <fw@strlen.de> | 2016-04-24 15:38:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-26 15:53:05 -0400 |
commit | f0cdf76c103ffa34ca5ac87dcdef7edffc722cbf (patch) | |
tree | 893afe6a3b448bfeb0dd36cae35a6ce844230852 /net/core | |
parent | a6086a893718db07ef9e7af5624ec27cb376ef0a (diff) |
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.c | 3 | ||||
-rw-r--r-- | net/core/pktgen.c | 1 |
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) | |||
162 | "%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x\n", | 162 | "%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x\n", |
163 | sd->processed, sd->dropped, sd->time_squeeze, 0, | 163 | sd->processed, sd->dropped, sd->time_squeeze, 0, |
164 | 0, 0, 0, 0, /* was fastroute */ | 164 | 0, 0, 0, 0, /* was fastroute */ |
165 | sd->cpu_collision, sd->received_rps, flow_limit_count); | 165 | 0, /* was cpu_collision */ |
166 | sd->received_rps, flow_limit_count); | ||
166 | return 0; | 167 | return 0; |
167 | } | 168 | } |
168 | 169 | ||
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: | |||
3472 | pkt_dev->odevname, ret); | 3472 | pkt_dev->odevname, ret); |
3473 | pkt_dev->errors++; | 3473 | pkt_dev->errors++; |
3474 | /* fallthru */ | 3474 | /* fallthru */ |
3475 | case NETDEV_TX_LOCKED: | ||
3476 | case NETDEV_TX_BUSY: | 3475 | case NETDEV_TX_BUSY: |
3477 | /* Retry it next time */ | 3476 | /* Retry it next time */ |
3478 | atomic_dec(&(pkt_dev->skb->users)); | 3477 | atomic_dec(&(pkt_dev->skb->users)); |