From 0b8d7126249a830652c75bf66b5a541802067f1a Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 10 May 2007 14:11:16 -0700
Subject: [PATCH] --- yaml --- r: 55967 b: refs/heads/master c:
 cce1fa36a8ed36e8a3f64455e2a830f48e904c64 h: refs/heads/master i:   55965:
 7edf76ffe0e677428b0b0b31771e859eaba15dc7   55963:
 e86aede2cc06c58281fc068cc778b7257a7039e1   55959:
 e6908350a8ab4ff7f52d345c20e9d2b03f13ada0   55951:
 2957ed7b65e61b26e75a5c0b02d055ad3dde753e   55935:
 a0b3bc37627f648ae1c16934e6adf67148acbf76 v: v3

---
 [refs]                        | 2 +-
 trunk/net/sched/sch_generic.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3b9630c4ac29..d188588cfef8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d90df3ad07a20cd93921e05ff2b12ca7030b4fd7
+refs/heads/master: cce1fa36a8ed36e8a3f64455e2a830f48e904c64
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
index 07200bfebf00..816d311db40f 100644
--- a/trunk/net/sched/sch_generic.c
+++ b/trunk/net/sched/sch_generic.c
@@ -132,6 +132,7 @@ static inline int qdisc_restart(struct net_device *dev)
 						netif_tx_unlock(dev);
 					}
 					spin_lock(&dev->queue_lock);
+					q = dev->qdisc;
 					goto out;
 				}
 				if (ret == NETDEV_TX_LOCKED && nolock) {