diff options
Diffstat (limited to 'net/core/netpoll.c')
-rw-r--r-- | net/core/netpoll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 1a7d8e2c9768..0d38808a2305 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
@@ -76,7 +76,7 @@ static void queue_process(struct work_struct *work) | |||
76 | 76 | ||
77 | local_irq_save(flags); | 77 | local_irq_save(flags); |
78 | __netif_tx_lock(txq, smp_processor_id()); | 78 | __netif_tx_lock(txq, smp_processor_id()); |
79 | if (netif_tx_queue_frozen_or_stopped(txq) || | 79 | if (netif_xmit_frozen_or_stopped(txq) || |
80 | ops->ndo_start_xmit(skb, dev) != NETDEV_TX_OK) { | 80 | ops->ndo_start_xmit(skb, dev) != NETDEV_TX_OK) { |
81 | skb_queue_head(&npinfo->txq, skb); | 81 | skb_queue_head(&npinfo->txq, skb); |
82 | __netif_tx_unlock(txq); | 82 | __netif_tx_unlock(txq); |
@@ -317,7 +317,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb, | |||
317 | for (tries = jiffies_to_usecs(1)/USEC_PER_POLL; | 317 | for (tries = jiffies_to_usecs(1)/USEC_PER_POLL; |
318 | tries > 0; --tries) { | 318 | tries > 0; --tries) { |
319 | if (__netif_tx_trylock(txq)) { | 319 | if (__netif_tx_trylock(txq)) { |
320 | if (!netif_tx_queue_stopped(txq)) { | 320 | if (!netif_xmit_stopped(txq)) { |
321 | status = ops->ndo_start_xmit(skb, dev); | 321 | status = ops->ndo_start_xmit(skb, dev); |
322 | if (status == NETDEV_TX_OK) | 322 | if (status == NETDEV_TX_OK) |
323 | txq_trans_update(txq); | 323 | txq_trans_update(txq); |