Merge tag 'iommu-updates-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

[deliverable/linux.git] / net / core / pktgen.c

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 20999aa596dd0296bbfec23f1ea5dda0a4adf244..8604ae2459608f36c2666fed3b2db2d06eda98af 100644 (file)
--- 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));