From dab6c30b4ccc8f42801ed7c204227a141795fea7 Mon Sep 17 00:00:00 2001 From: Krishna Kumar Date: Sun, 24 Jun 2007 19:57:27 -0700 Subject: [PATCH] --- yaml --- r: 58924 b: refs/heads/master c: e50c41b53d7aa48152dd9c633b04fc7abd536f1f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sched/sch_generic.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c0fb1b8cbb63..cdefc3e926e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c1361a6f285bf3df4b502651c0dd38d0eedc044 +refs/heads/master: e50c41b53d7aa48152dd9c633b04fc7abd536f1f diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c index 983c32caf713..2488dbb17b60 100644 --- a/trunk/net/sched/sch_generic.c +++ b/trunk/net/sched/sch_generic.c @@ -61,7 +61,6 @@ void qdisc_unlock_tree(struct net_device *dev) static inline int qdisc_qlen(struct Qdisc *q) { - BUG_ON((int) q->q.qlen < 0); return q->q.qlen; } @@ -167,9 +166,7 @@ static inline int qdisc_restart(struct net_device *dev) /* And release queue */ spin_unlock(&dev->queue_lock); - ret = NETDEV_TX_BUSY; - if (!netif_queue_stopped(dev)) - ret = dev_hard_start_xmit(skb, dev); + ret = dev_hard_start_xmit(skb, dev); if (!lockless) netif_tx_unlock(dev);