summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2014-04-07 17:18:30 +0200
committerDavid S. Miller <davem@davemloft.net>2014-04-07 15:20:44 -0400
commit6f25cd47dcd2b9912c6e52aa833ba1614f7b5086 (patch)
treeb86524a8db6002c790bae2da003f4598b3ea8f2d /net
parentc293fb785bdda64d88f197e6758a3c16ae83e569 (diff)
downloadlinux-stable-6f25cd47dcd2b9912c6e52aa833ba1614f7b5086.tar.gz
linux-stable-6f25cd47dcd2b9912c6e52aa833ba1614f7b5086.tar.bz2
linux-stable-6f25cd47dcd2b9912c6e52aa833ba1614f7b5086.zip
pktgen: fix xmit test for BQL enabled devices
Similarly as in commit 8e2f1a63f221 ("packet: fix packet_direct_xmit for BQL enabled drivers"), we test for __QUEUE_STATE_STACK_XOFF bit in pktgen's xmit, which would not fully fill the device's TX ring for BQL drivers that use netdev_tx_sent_queue(). Fix is to use, similarly as we do in packet sockets, netif_xmit_frozen_or_drv_stopped() test. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Cc: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/pktgen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index d0dac57291af..d068ec25db1e 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3340,7 +3340,7 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
__netif_tx_lock_bh(txq);
- if (unlikely(netif_xmit_frozen_or_stopped(txq))) {
+ if (unlikely(netif_xmit_frozen_or_drv_stopped(txq))) {
ret = NETDEV_TX_BUSY;
pkt_dev->last_ok = 0;
goto unlock;