aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-05-10 17:11:16 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-05-11 02:47:41 -0400
commitcce1fa36a8ed36e8a3f64455e2a830f48e904c64 (patch)
treea392228b6b8d88a339cf9645548e31188ca4fb74 /net
parentd90df3ad07a20cd93921e05ff2b12ca7030b4fd7 (diff)
[NET_SCHED]: Reread dev->qdisc for NETDEV_TX_OK
Now that we return the queue length after NETDEV_TX_OK we better make sure that we have the right queue. Otherwise we can cause a stall after a really quick dev_deactive/dev_activate. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_generic.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 07200bfebf00..816d311db40f 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -132,6 +132,7 @@ static inline int qdisc_restart(struct net_device *dev)
132 netif_tx_unlock(dev); 132 netif_tx_unlock(dev);
133 } 133 }
134 spin_lock(&dev->queue_lock); 134 spin_lock(&dev->queue_lock);
135 q = dev->qdisc;
135 goto out; 136 goto out;
136 } 137 }
137 if (ret == NETDEV_TX_LOCKED && nolock) { 138 if (ret == NETDEV_TX_LOCKED && nolock) {