net: core: Make netif_wake_subqueue a wrapper

netif_wake_subqueue() is duplicating the same thing that netif_tx_wake_queue()
does, so make it call it directly after looking up the queue from the index.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index ebd9e2c12f44c0e9ccf5ded4cbdff3924035faf5..97ae0ac513eeec64da23b1df65f17e13a1e1ab1d 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3106,7 +3106,19 @@ static inline bool netif_subqueue_stopped(const struct net_device *dev,
        return __netif_subqueue_stopped(dev, skb_get_queue_mapping(skb));
 }
 
-void netif_wake_subqueue(struct net_device *dev, u16 queue_index);
+/**
+ *     netif_wake_subqueue - allow sending packets on subqueue
+ *     @dev: network device
+ *     @queue_index: sub queue index
+ *
+ * Resume individual transmit queue of a device with multiple transmit queues.
+ */
+static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
+{
+       struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
+
+       netif_tx_wake_queue(txq);
+}
 
 #ifdef CONFIG_XPS
 int netif_set_xps_queue(struct net_device *dev, const struct cpumask *mask,

diff --git a/net/core/dev.c b/net/core/dev.c
index e98cc06d2577620e9868b4d55f1f7f1597d70ecf..ad5959e561166f445bdd9d7260652a338f74cfea 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2408,28 +2408,6 @@ void netif_schedule_queue(struct netdev_queue *txq)
 }
 EXPORT_SYMBOL(netif_schedule_queue);
 
-/**
- *     netif_wake_subqueue - allow sending packets on subqueue
- *     @dev: network device
- *     @queue_index: sub queue index
- *
- * Resume individual transmit queue of a device with multiple transmit queues.
- */
-void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
-{
-       struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
-
-       if (test_and_clear_bit(__QUEUE_STATE_DRV_XOFF, &txq->state)) {
-               struct Qdisc *q;
-
-               rcu_read_lock();
-               q = rcu_dereference(txq->qdisc);
-               __netif_schedule(q);
-               rcu_read_unlock();
-       }
-}
-EXPORT_SYMBOL(netif_wake_subqueue);
-
 void netif_tx_wake_queue(struct netdev_queue *dev_queue)
 {
        if (test_and_clear_bit(__QUEUE_STATE_DRV_XOFF, &dev_queue->state)) {