Commit 1936502d authored Mar 22, 2007 by Stephen Hemminger Committed by David S. Miller Apr 25, 2007

[NET_SCHED] qdisc: avoid transmit softirq on watchdog wakeup



If possible, avoid having to do a transmit softirq when a qdisc
watchdog decides to re-enable.  The watchdog routine runs off
a timer, so it is already in the same effective context as
the softirq.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 11274e5a

net/sched/sch_api.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -296,10 +296,16 @@ static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer)
		{
		struct qdisc_watchdog *wd = container_of(timer, struct qdisc_watchdog,
		timer);
		struct net_device *dev = wd->qdisc->dev;

		wd->qdisc->flags &= ~TCQ_F_THROTTLED;
		smp_wmb();
		netif_schedule(wd->qdisc->dev);
		if (spin_trylock(&dev->queue_lock)) {
		qdisc_run(dev);
		spin_unlock(&dev->queue_lock);
		} else
		netif_schedule(dev);

		return HRTIMER_NORESTART;
		}