diff options
-rw-r--r-- | include/linux/netdevice.h | 3 | ||||
-rw-r--r-- | net/core/dev.c | 6 | ||||
-rw-r--r-- | net/core/netpoll.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 82264e717e53..6c131f055ab0 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -1403,6 +1403,9 @@ static inline void netdev_for_each_tx_queue(struct net_device *dev, | |||
1403 | f(dev, &dev->_tx[i], arg); | 1403 | f(dev, &dev->_tx[i], arg); |
1404 | } | 1404 | } |
1405 | 1405 | ||
1406 | extern struct netdev_queue *netdev_pick_tx(struct net_device *dev, | ||
1407 | struct sk_buff *skb); | ||
1408 | |||
1406 | /* | 1409 | /* |
1407 | * Net namespace inlines | 1410 | * Net namespace inlines |
1408 | */ | 1411 | */ |
diff --git a/net/core/dev.c b/net/core/dev.c index bbda81997f4f..707b12425a79 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -2396,8 +2396,8 @@ static inline int get_xps_queue(struct net_device *dev, struct sk_buff *skb) | |||
2396 | #endif | 2396 | #endif |
2397 | } | 2397 | } |
2398 | 2398 | ||
2399 | static struct netdev_queue *dev_pick_tx(struct net_device *dev, | 2399 | struct netdev_queue *netdev_pick_tx(struct net_device *dev, |
2400 | struct sk_buff *skb) | 2400 | struct sk_buff *skb) |
2401 | { | 2401 | { |
2402 | int queue_index; | 2402 | int queue_index; |
2403 | const struct net_device_ops *ops = dev->netdev_ops; | 2403 | const struct net_device_ops *ops = dev->netdev_ops; |
@@ -2571,7 +2571,7 @@ int dev_queue_xmit(struct sk_buff *skb) | |||
2571 | 2571 | ||
2572 | skb_update_prio(skb); | 2572 | skb_update_prio(skb); |
2573 | 2573 | ||
2574 | txq = dev_pick_tx(dev, skb); | 2574 | txq = netdev_pick_tx(dev, skb); |
2575 | q = rcu_dereference_bh(txq->qdisc); | 2575 | q = rcu_dereference_bh(txq->qdisc); |
2576 | 2576 | ||
2577 | #ifdef CONFIG_NET_CLS_ACT | 2577 | #ifdef CONFIG_NET_CLS_ACT |
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index dd67818025d1..77a0388fc3be 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
@@ -328,7 +328,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb, | |||
328 | if (skb_queue_len(&npinfo->txq) == 0 && !netpoll_owner_active(dev)) { | 328 | if (skb_queue_len(&npinfo->txq) == 0 && !netpoll_owner_active(dev)) { |
329 | struct netdev_queue *txq; | 329 | struct netdev_queue *txq; |
330 | 330 | ||
331 | txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb)); | 331 | txq = netdev_pick_tx(dev, skb); |
332 | 332 | ||
333 | /* try until next clock tick */ | 333 | /* try until next clock tick */ |
334 | for (tries = jiffies_to_usecs(1)/USEC_PER_POLL; | 334 | for (tries = jiffies_to_usecs(1)/USEC_PER_POLL; |