summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorChangli Gao <xiaosuo@gmail.com>2010-12-04 14:09:08 +0000
committerDavid S. Miller <davem@davemloft.net>2010-12-08 09:45:34 -0800
commit75c1c82566f23dd539fb7ccbf57a1caa7ba82628 (patch)
treebc88a871b3d1f9b1dcd5b9722c0edbea8a465faa /drivers
parentb1afde60f2b9ee8444fba4e012dc99a3b28d224d (diff)
ifb: goto resched directly if error happens and dp->tq isn't empty
If we break the loop when there are still skbs in tq and no skb in rq, the skbs will be left in txq until new skbs are enqueued into rq. In rare cases, no new skb is queued, then these skbs will stay in rq forever. After this patch, if tq isn't empty when we break the loop, we goto resched directly. Signed-off-by: Changli Gao <xiaosuo@gmail.com> Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ifb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index ab9f675c5b8b..fe337bd121aa 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -104,6 +104,8 @@ static void ri_tasklet(unsigned long dev)
rcu_read_unlock();
dev_kfree_skb(skb);
stats->tx_dropped++;
+ if (skb_queue_len(&dp->tq) != 0)
+ goto resched;
break;
}
rcu_read_unlock();