From d6f4fda2931354cb634e73f88071d624b9ab0ddd Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sun, 17 Aug 2008 21:51:03 -0700
Subject: [PATCH] --- yaml --- r: 108811 b: refs/heads/master c:
 a9312ae89324438b0edc554eb36c3ec6bf927d04 h: refs/heads/master i:   108809:
 988affb700a8d60ce8c74498c5967627a2c77c04   108807:
 99f11bdfe0274ff094a62b5cfcd27c30fce5de42 v: v3

---
 [refs]                          | 2 +-
 trunk/include/net/sch_generic.h | 1 +
 trunk/net/core/dev.c            | 9 ++++++++-
 trunk/net/sched/sch_generic.c   | 6 ++++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 43d34103e038..47530aa7e43c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08013fa353fdcfc0a03cae805393abfc56722387
+refs/heads/master: a9312ae89324438b0edc554eb36c3ec6bf927d04
diff --git a/trunk/include/net/sch_generic.h b/trunk/include/net/sch_generic.h
index a7abfda3e447..757ab087adbf 100644
--- a/trunk/include/net/sch_generic.h
+++ b/trunk/include/net/sch_generic.h
@@ -27,6 +27,7 @@ enum qdisc_state_t
 {
 	__QDISC_STATE_RUNNING,
 	__QDISC_STATE_SCHED,
+	__QDISC_STATE_DEACTIVATED,
 };
 
 struct qdisc_size_table {
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 600bb23c4c2e..d9e31f63aded 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1800,6 +1800,12 @@ int dev_queue_xmit(struct sk_buff *skb)
 
 		spin_lock(root_lock);
 
+		if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED, &q->state))) {
+			spin_unlock(root_lock);
+			rc = NET_XMIT_DROP;
+			goto out_kfree_skb;
+		}
+
 		rc = qdisc_enqueue_root(skb, q);
 		qdisc_run(q);
 
@@ -2084,7 +2090,8 @@ static int ing_filter(struct sk_buff *skb)
 	q = rxq->qdisc;
 	if (q != &noop_qdisc) {
 		spin_lock(qdisc_lock(q));
-		result = qdisc_enqueue_root(skb, q);
+		if (likely(!test_bit(__QDISC_STATE_DEACTIVATED, &q->state)))
+			result = qdisc_enqueue_root(skb, q);
 		spin_unlock(qdisc_lock(q));
 	}
 
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
index 468574682caa..ff1c4557e5f8 100644
--- a/trunk/net/sched/sch_generic.c
+++ b/trunk/net/sched/sch_generic.c
@@ -597,6 +597,9 @@ static void transition_one_qdisc(struct net_device *dev,
 	struct Qdisc *new_qdisc = dev_queue->qdisc_sleeping;
 	int *need_watchdog_p = _need_watchdog;
 
+	if (!(new_qdisc->flags & TCQ_F_BUILTIN))
+		clear_bit(__QDISC_STATE_DEACTIVATED, &new_qdisc->state);
+
 	rcu_assign_pointer(dev_queue->qdisc, new_qdisc);
 	if (need_watchdog_p && new_qdisc != &noqueue_qdisc)
 		*need_watchdog_p = 1;
@@ -640,6 +643,9 @@ static void dev_deactivate_queue(struct net_device *dev,
 	if (qdisc) {
 		spin_lock_bh(qdisc_lock(qdisc));
 
+		if (!(qdisc->flags & TCQ_F_BUILTIN))
+			set_bit(__QDISC_STATE_DEACTIVATED, &qdisc->state);
+
 		dev_queue->qdisc = qdisc_default;
 		qdisc_reset(qdisc);