Commit:     cce1fa36a8ed36e8a3f64455e2a830f48e904c64
Parent:     d90df3ad07a20cd93921e05ff2b12ca7030b4fd7
Author:     Herbert Xu <[EMAIL PROTECTED]>
AuthorDate: Thu May 10 14:11:16 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Thu May 10 23:47:41 2007 -0700

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 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 07200bf..816d311 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)
+                                       q = dev->qdisc;
                                        goto out;
                                if (ret == NETDEV_TX_LOCKED && nolock) {
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to