Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cce1fa36 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d90df3ad

net/sched/sch_generic.c

+1 −0
Original line number Diff line number Diff line
@@ -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) {