aboutsummaryrefslogtreecommitdiffstats
path: root/net/packet
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/packet
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/packet')
-rw-r--r--net/packet/af_packet.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 0dfa990d4eaa..b7a7f5a721bd 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -243,7 +243,6 @@ static int packet_direct_xmit(struct sk_buff *skb)
243 netdev_features_t features; 243 netdev_features_t features;
244 struct netdev_queue *txq; 244 struct netdev_queue *txq;
245 int ret = NETDEV_TX_BUSY; 245 int ret = NETDEV_TX_BUSY;
246 u16 queue_map;
247 246
248 if (unlikely(!netif_running(dev) || 247 if (unlikely(!netif_running(dev) ||
249 !netif_carrier_ok(dev))) 248 !netif_carrier_ok(dev)))
@@ -254,8 +253,7 @@ static int packet_direct_xmit(struct sk_buff *skb)
254 __skb_linearize(skb)) 253 __skb_linearize(skb))
255 goto drop; 254 goto drop;
256 255
257 queue_map = skb_get_queue_mapping(skb); 256 txq = skb_get_tx_queue(dev, skb);
258 txq = netdev_get_tx_queue(dev, queue_map);
259 257
260 local_bh_disable(); 258 local_bh_disable();
261 259