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>

3 files changed, 2 insertions, 34 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));
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 80742edea96f..9c7756237904 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -108,35 +108,6 @@ static struct sk_buff *dequeue_skb(struct Qdisc *q, bool *validate,
         return skb;
 }
 
-static inline int handle_dev_cpu_collision(struct sk_buff *skb,
-                                           struct netdev_queue *dev_queue,
-                                           struct Qdisc *q)
-{
-        int ret;
-
-        if (unlikely(dev_queue->xmit_lock_owner == smp_processor_id())) {
-                /*
-                 * Same CPU holding the lock. It may be a transient
-                 * configuration error, when hard_start_xmit() recurses. We
-                 * detect it by checking xmit owner and drop the packet when
-                 * deadloop is detected. Return OK to try the next skb.
-                 */
-                kfree_skb_list(skb);
-                net_warn_ratelimited("Dead loop on netdevice %s, fix it urgently!\n",
-                                     dev_queue->dev->name);
-                ret = qdisc_qlen(q);
-        } else {
-                /*
-                 * Another cpu is holding lock, requeue & delay xmits for
-                 * some time.
-                 */
-                __this_cpu_inc(softnet_data.cpu_collision);
-                ret = dev_requeue_skb(skb, q);
-        }
-
-        return ret;
-}
-
 /*
  * Transmit possibly several skbs, and handle the return status as
  * required. Holding the __QDISC___STATE_RUNNING bit guarantees that
@@ -174,9 +145,6 @@ int sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q,
         if (dev_xmit_complete(ret)) {
                 /* Driver sent out skb successfully or skb was consumed */
                 ret = qdisc_qlen(q);
-        } else if (ret == NETDEV_TX_LOCKED) {
-                /* Driver try lock failed */
-                ret = handle_dev_cpu_collision(skb, txq, q);
         } else {
                 /* Driver returned NETDEV_TX_BUSY - requeue skb */
                 if (unlikely(ret != NETDEV_TX_BUSY))