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) {