aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/pktgen.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-21 20:01:56 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-22 05:59:56 -0400
commit668f895a85b0c3a62a690425145f13dabebebd7a (patch)
tree24a10711c3c2d7d6bf710b99d36a1510de184566 /net/core/pktgen.c
parent4e3ab47a547616e583c7a5458beced6aa34c8ef3 (diff)
[NET]: Hide the queue_mapping field inside netif_subqueue_stopped
Many places get the queue_mapping field from skb to pass it to the netif_subqueue_stopped() which will be 0 in any case. Make the helper that works with sk_buff Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/pktgen.c')
-rw-r--r--net/core/pktgen.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index b78235e5a7f4..de33f36947e9 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3383,7 +3383,7 @@ static __inline__ void pktgen_xmit(struct pktgen_dev *pkt_dev)
3383 3383
3384 if ((netif_queue_stopped(odev) || 3384 if ((netif_queue_stopped(odev) ||
3385 (pkt_dev->skb && 3385 (pkt_dev->skb &&
3386 netif_subqueue_stopped(odev, pkt_dev->skb->queue_mapping))) || 3386 netif_subqueue_stopped(odev, pkt_dev->skb))) ||
3387 need_resched()) { 3387 need_resched()) {
3388 idle_start = getCurUs(); 3388 idle_start = getCurUs();
3389 3389
@@ -3400,7 +3400,7 @@ static __inline__ void pktgen_xmit(struct pktgen_dev *pkt_dev)
3400 pkt_dev->idle_acc += getCurUs() - idle_start; 3400 pkt_dev->idle_acc += getCurUs() - idle_start;
3401 3401
3402 if (netif_queue_stopped(odev) || 3402 if (netif_queue_stopped(odev) ||
3403 netif_subqueue_stopped(odev, pkt_dev->skb->queue_mapping)) { 3403 netif_subqueue_stopped(odev, pkt_dev->skb)) {
3404 pkt_dev->next_tx_us = getCurUs(); /* TODO */ 3404 pkt_dev->next_tx_us = getCurUs(); /* TODO */
3405 pkt_dev->next_tx_ns = 0; 3405 pkt_dev->next_tx_ns = 0;
3406 goto out; /* Try the next interface */ 3406 goto out; /* Try the next interface */
@@ -3429,7 +3429,7 @@ static __inline__ void pktgen_xmit(struct pktgen_dev *pkt_dev)
3429 3429
3430 netif_tx_lock_bh(odev); 3430 netif_tx_lock_bh(odev);
3431 if (!netif_queue_stopped(odev) && 3431 if (!netif_queue_stopped(odev) &&
3432 !netif_subqueue_stopped(odev, pkt_dev->skb->queue_mapping)) { 3432 !netif_subqueue_stopped(odev, pkt_dev->skb)) {
3433 3433
3434 atomic_inc(&(pkt_dev->skb->users)); 3434 atomic_inc(&(pkt_dev->skb->users));
3435 retry_now: 3435 retry_now: