diff options
| author | Rob Herring <robh@kernel.org> | 2018-12-13 20:20:36 +0300 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-12-13 20:20:36 +0300 |
| commit | acc2038738bd6f881e7a277ba14fa7c589fd3058 (patch) | |
| tree | fd56524867a9b726b3e5d2cb040ff16b2f2a67a0 /net/core/dev.c | |
| parent | cd1cc0bef46fc8d8f9ebe82d2064d4f4bd5ecf16 (diff) | |
| parent | 2c9b0b00af23cdc70d28d82e077dc1d280bcb84a (diff) | |
| download | linux-acc2038738bd6f881e7a277ba14fa7c589fd3058.tar.xz | |
Merge branch 'yaml-bindings-for-v4.21' into dt/next
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 77d43ae2a7bb..0ffcbdd55fa9 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3272,7 +3272,7 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *first, struct net_device *de } skb = next; - if (netif_xmit_stopped(txq) && skb) { + if (netif_tx_queue_stopped(txq) && skb) { rc = NETDEV_TX_BUSY; break; } |