netdev: Make netif_schedule() routines work with netdev_queue objects.
Only plain netif_schedule() remains taking a net_device, mostly as a
compatability item while we transition the rest of these interfaces.
Everything else calls netif_schedule_queue() or __netif_schedule(),
both of which take a netdev_queue pointer.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index aae6c6d..28aa8e7 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -952,12 +952,19 @@
#define HAVE_NETIF_QUEUE
-extern void __netif_schedule(struct net_device *dev);
+extern void __netif_schedule(struct netdev_queue *txq);
+
+static inline void netif_schedule_queue(struct netdev_queue *txq)
+{
+ struct net_device *dev = txq->dev;
+
+ if (!test_bit(__LINK_STATE_XOFF, &dev->state))
+ __netif_schedule(txq);
+}
static inline void netif_schedule(struct net_device *dev)
{
- if (!test_bit(__LINK_STATE_XOFF, &dev->state))
- __netif_schedule(dev);
+ netif_schedule_queue(&dev->tx_queue);
}
/**
@@ -987,7 +994,7 @@
}
#endif
if (test_and_clear_bit(__LINK_STATE_XOFF, &dev->state))
- __netif_schedule(dev);
+ __netif_schedule(&dev->tx_queue);
}
/**
@@ -1103,7 +1110,7 @@
#endif
if (test_and_clear_bit(__LINK_STATE_XOFF,
&dev->egress_subqueue[queue_index].state))
- __netif_schedule(dev);
+ __netif_schedule(&dev->tx_queue);
#endif
}
diff --git a/net/core/dev.c b/net/core/dev.c
index d6b8d3c..0dc888a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1320,12 +1320,13 @@
}
-void __netif_schedule(struct net_device *dev)
+void __netif_schedule(struct netdev_queue *txq)
{
+ struct net_device *dev = txq->dev;
+
if (!test_and_set_bit(__LINK_STATE_SCHED, &dev->state)) {
- struct netdev_queue *txq = &dev->tx_queue;
- unsigned long flags;
struct softnet_data *sd;
+ unsigned long flags;
local_irq_save(flags);
sd = &__get_cpu_var(softnet_data);
@@ -1932,7 +1933,7 @@
qdisc_run(dev);
spin_unlock(&txq->lock);
} else {
- netif_schedule(dev);
+ netif_schedule_queue(txq);
}
}
}
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 2968baa..1c4d3ba 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -885,10 +885,10 @@
spin_unlock_bh(&txq->lock);
/* we just requeued the all the frames that were in the removed
- * queue, and since we might miss a softirq we do netif_schedule.
+ * queue, and since we might miss a softirq we do netif_schedule_queue.
* ieee80211_wake_queue is not used here as this queue is not
* necessarily stopped */
- netif_schedule(local->mdev);
+ netif_schedule_queue(txq);
spin_lock_bh(&sta->lock);
*state = HT_AGG_STATE_IDLE;
sta->ampdu_mlme.addba_req_num[tid] = 0;
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index e73bd68..95873f8 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -282,11 +282,11 @@
{
struct qdisc_watchdog *wd = container_of(timer, struct qdisc_watchdog,
timer);
- struct net_device *dev = qdisc_dev(wd->qdisc);
+ struct netdev_queue *txq = wd->qdisc->dev_queue;
wd->qdisc->flags &= ~TCQ_F_THROTTLED;
smp_wmb();
- netif_schedule(dev);
+ netif_schedule_queue(txq);
return HRTIMER_NORESTART;
}
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 99ce3da..4efc836 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -650,7 +650,7 @@
}
sch->flags &= ~TCQ_F_THROTTLED;
- netif_schedule(qdisc_dev(sch));
+ netif_schedule_queue(sch->dev_queue);
return HRTIMER_NORESTART;
}
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 8247a40..407dfdb 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -62,7 +62,7 @@
return q->q.qlen;
}
-static inline int dev_requeue_skb(struct sk_buff *skb, struct net_device *dev,
+static inline int dev_requeue_skb(struct sk_buff *skb,
struct netdev_queue *dev_queue,
struct Qdisc *q)
{
@@ -71,7 +71,7 @@
else
q->ops->requeue(skb, q);
- netif_schedule(dev);
+ netif_schedule_queue(dev_queue);
return 0;
}
@@ -114,7 +114,7 @@
* some time.
*/
__get_cpu_var(netdev_rx_stat).cpu_collision++;
- ret = dev_requeue_skb(skb, dev, dev_queue, q);
+ ret = dev_requeue_skb(skb, dev_queue, q);
}
return ret;
@@ -179,7 +179,7 @@
printk(KERN_WARNING "BUG %s code %d qlen %d\n",
dev->name, ret, q->q.qlen);
- ret = dev_requeue_skb(skb, dev, txq, q);
+ ret = dev_requeue_skb(skb, txq, q);
break;
}
@@ -200,7 +200,7 @@
* 2. we've been doing it for too long.
*/
if (need_resched() || jiffies != start_time) {
- netif_schedule(dev);
+ netif_schedule_queue(&dev->tx_queue);
break;
}
}