From 7fc4e822b55f548c477ff975c5d20230b5b5a186 Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Sat, 4 Dec 2010 15:01:52 +0000
Subject: [PATCH] --- yaml --- r: 224967 b: refs/heads/master c:
 957fca95e3521e471aac4c2e4cfbc21f399bdd84 h: refs/heads/master i:   224965:
 7c19058095036290ebb406d6b819a061c70786ef   224963:
 75ed517aa3f3b583e0a3aa6ce0f7f0b359eeb55c   224959:
 3dd1b3ea8a807295e1bf7061d216de1db75d6f79 v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/net/ifb.c | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 0fbda8816c86..b8cf3fde66b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6350362cbb19882ba0eb3578cc1abc07e6ea204
+refs/heads/master: 957fca95e3521e471aac4c2e4cfbc21f399bdd84
diff --git a/trunk/drivers/net/ifb.c b/trunk/drivers/net/ifb.c
index d58c4f74f01a..bfa03db66691 100644
--- a/trunk/drivers/net/ifb.c
+++ b/trunk/drivers/net/ifb.c
@@ -63,9 +63,7 @@ static void ri_tasklet(unsigned long dev)
 	txq = netdev_get_tx_queue(_dev, 0);
 	if ((skb = skb_peek(&dp->tq)) == NULL) {
 		if (__netif_tx_trylock(txq)) {
-			while ((skb = skb_dequeue(&dp->rq)) != NULL) {
-				skb_queue_tail(&dp->tq, skb);
-			}
+			skb_queue_splice_tail_init(&dp->rq, &dp->tq);
 			__netif_tx_unlock(txq);
 		} else {
 			/* reschedule */
@@ -163,7 +161,7 @@ static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev)
 		netif_stop_queue(dev);
 	}
 
-	skb_queue_tail(&dp->rq, skb);
+	__skb_queue_tail(&dp->rq, skb);
 	if (!dp->tasklet_pending) {
 		dp->tasklet_pending = 1;
 		tasklet_schedule(&dp->ifb_tasklet);
@@ -178,8 +176,8 @@ static int ifb_close(struct net_device *dev)
 
 	tasklet_kill(&dp->ifb_tasklet);
 	netif_stop_queue(dev);
-	skb_queue_purge(&dp->rq);
-	skb_queue_purge(&dp->tq);
+	__skb_queue_purge(&dp->rq);
+	__skb_queue_purge(&dp->tq);
 	return 0;
 }
 
@@ -188,8 +186,8 @@ static int ifb_open(struct net_device *dev)
 	struct ifb_private *dp = netdev_priv(dev);
 
 	tasklet_init(&dp->ifb_tasklet, ri_tasklet, (unsigned long)dev);
-	skb_queue_head_init(&dp->rq);
-	skb_queue_head_init(&dp->tq);
+	__skb_queue_head_init(&dp->rq);
+	__skb_queue_head_init(&dp->tq);
 	netif_start_queue(dev);
 
 	return 0;