aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index c7ef6c5d3782..cb8f753b4238 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2270,7 +2270,7 @@ gso:
2270 return rc; 2270 return rc;
2271 } 2271 }
2272 txq_trans_update(txq); 2272 txq_trans_update(txq);
2273 if (unlikely(netif_tx_queue_stopped(txq) && skb->next)) 2273 if (unlikely(netif_xmit_stopped(txq) && skb->next))
2274 return NETDEV_TX_BUSY; 2274 return NETDEV_TX_BUSY;
2275 } while (skb->next); 2275 } while (skb->next);
2276 2276
@@ -2558,7 +2558,7 @@ int dev_queue_xmit(struct sk_buff *skb)
2558 2558
2559 HARD_TX_LOCK(dev, txq, cpu); 2559 HARD_TX_LOCK(dev, txq, cpu);
2560 2560
2561 if (!netif_tx_queue_stopped(txq)) { 2561 if (!netif_xmit_stopped(txq)) {
2562 __this_cpu_inc(xmit_recursion); 2562 __this_cpu_inc(xmit_recursion);
2563 rc = dev_hard_start_xmit(skb, dev, txq); 2563 rc = dev_hard_start_xmit(skb, dev, txq);
2564 __this_cpu_dec(xmit_recursion); 2564 __this_cpu_dec(xmit_recursion);