aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/sched/sch_generic.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 983c32caf713..2488dbb17b60 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -61,7 +61,6 @@ void qdisc_unlock_tree(struct net_device *dev)
61 61
62static inline int qdisc_qlen(struct Qdisc *q) 62static inline int qdisc_qlen(struct Qdisc *q)
63{ 63{
64 BUG_ON((int) q->q.qlen < 0);
65 return q->q.qlen; 64 return q->q.qlen;
66} 65}
67 66
@@ -167,9 +166,7 @@ static inline int qdisc_restart(struct net_device *dev)
167 /* And release queue */ 166 /* And release queue */
168 spin_unlock(&dev->queue_lock); 167 spin_unlock(&dev->queue_lock);
169 168
170 ret = NETDEV_TX_BUSY; 169 ret = dev_hard_start_xmit(skb, dev);
171 if (!netif_queue_stopped(dev))
172 ret = dev_hard_start_xmit(skb, dev);
173 170
174 if (!lockless) 171 if (!lockless)
175 netif_tx_unlock(dev); 172 netif_tx_unlock(dev);