diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-05-10 14:11:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-05-10 23:47:41 -0700 |
| commit | cce1fa36a8ed36e8a3f64455e2a830f48e904c64 (patch) | |
| tree | a392228b6b8d88a339cf9645548e31188ca4fb74 /net | |
| parent | d90df3ad07a20cd93921e05ff2b12ca7030b4fd7 (diff) | |
| download | linux-3.10-cce1fa36a8ed36e8a3f64455e2a830f48e904c64.tar.gz linux-3.10-cce1fa36a8ed36e8a3f64455e2a830f48e904c64.tar.bz2 linux-3.10-cce1fa36a8ed36e8a3f64455e2a830f48e904c64.zip | |
[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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 07200bfebf0..816d311db40 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) netif_tx_unlock(dev); } spin_lock(&dev->queue_lock); + q = dev->qdisc; goto out; } if (ret == NETDEV_TX_LOCKED && nolock) { |