From: Herbert Xu Date: Thu, 10 May 2007 21:12:47 +0000 (-0700) Subject: [NET_SCHED]: Avoid requeue warning on dev_deactivate X-Git-Tag: v2.6.22-rc1~34^2~9 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41a23b0788610b27ecb4c4ee857f3fe7168f1070;p=pandora-kernel.git [NET_SCHED]: Avoid requeue warning on dev_deactivate When we relinquish queue_lock in qdisc_restart and then retake it for requeueing, we might race against dev_deactivate and end up requeueing onto noop_qdisc. This causes a warning to be printed. This patch fixes this by checking this before we requeue. As an added bonus, we can remove the same check in __qdisc_run which was added to prevent dev->gso_skb from being requeued when we're shutting down. Even though we've had to add a new conditional in its place, it's better because it only happens on requeues rather than every single time that qdisc_run is called. For this to work we also need to move the clearing of gso_skb up in dev_deactivate as now qdisc_restart can occur even after we wait for __LINK_STATE_QDISC_RUNNING to clear (but it won't do anything as long as the queue and gso_skb is already clear). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller --- Reading git-diff-tree failed