From 7edf76ffe0e677428b0b0b31771e859eaba15dc7 Mon Sep 17 00:00:00 2001
From: Thomas Graf <tgraf@suug.ch>
Date: Thu, 10 May 2007 04:02:41 -0700
Subject: [PATCH] --- yaml --- r: 55965 b: refs/heads/master c:
 5830725f8a36908111ecccf2899d06d6dcf54d45 h: refs/heads/master i:   55963:
 e86aede2cc06c58281fc068cc778b7257a7039e1 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 83ae6019dd86..ac70e6bf04d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc038410b4b1643766f8033f4940bcdb1dace633
+refs/heads/master: 5830725f8a36908111ecccf2899d06d6dcf54d45
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
index 3385ee592541..a8240c578772 100644
--- a/trunk/net/sched/sch_generic.c
+++ b/trunk/net/sched/sch_generic.c
@@ -139,6 +139,7 @@ static inline int qdisc_restart(struct net_device *dev)
 				}
 				if (ret == NETDEV_TX_LOCKED && nolock) {
 					spin_lock(&dev->queue_lock);
+					q = dev->qdisc;
 					goto collision;
 				}
 			}