aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/pktgen.c
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2014-08-27 05:11:27 -0400
committerDavid S. Miller <davem@davemloft.net>2014-08-29 23:02:07 -0400
commit10c51b56232d24f150e39884a9e749fd99cbc60c (patch)
tree4baa9297a591c45bbb1a148bfc3c9c1822f6ce3a /net/core/pktgen.c
parenta3bf5c429eb5f5ec4d364d51dfa8855efcc005f8 (diff)
net: add skb_get_tx_queue() helper
Replace occurences of skb_get_queue_mapping() and follow-up netdev_get_tx_queue() with an actual helper function. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/pktgen.c')
-rw-r--r--net/core/pktgen.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 83e2b4b19eb7..d81b540096c3 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3286,7 +3286,6 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
3286{ 3286{
3287 struct net_device *odev = pkt_dev->odev; 3287 struct net_device *odev = pkt_dev->odev;
3288 struct netdev_queue *txq; 3288 struct netdev_queue *txq;
3289 u16 queue_map;
3290 int ret; 3289 int ret;
3291 3290
3292 /* If device is offline, then don't send */ 3291 /* If device is offline, then don't send */
@@ -3324,8 +3323,7 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
3324 if (pkt_dev->delay && pkt_dev->last_ok) 3323 if (pkt_dev->delay && pkt_dev->last_ok)
3325 spin(pkt_dev, pkt_dev->next_tx); 3324 spin(pkt_dev, pkt_dev->next_tx);
3326 3325
3327 queue_map = skb_get_queue_mapping(pkt_dev->skb); 3326 txq = skb_get_tx_queue(odev, pkt_dev->skb);
3328 txq = netdev_get_tx_queue(odev, queue_map);
3329 3327
3330 local_bh_disable(); 3328 local_bh_disable();
3331 3329