From 04a6d93980e1c19ef7127f8267309a60ca7dc9e0 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 28 May 2009 01:22:57 -0700
Subject: [PATCH] --- yaml --- r: 150537 b: refs/heads/master c:
 46c37672d7fff0097385eb0cbd01aa0254dad0aa h: refs/heads/master i:   150535:
 ab382f4b0710c48216447af19e637c1e7f33ef2f v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/wireless/rtl818x/rtl8187_dev.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9f84301a4f7c..0cb73e0b90eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1091aae19b1d9c85d91c86915a611387f67a26b
+refs/heads/master: 46c37672d7fff0097385eb0cbd01aa0254dad0aa
diff --git a/trunk/drivers/net/wireless/rtl818x/rtl8187_dev.c b/trunk/drivers/net/wireless/rtl818x/rtl8187_dev.c
index 6499ccc34c94..3f22cc0c9679 100644
--- a/trunk/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/trunk/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -321,12 +321,7 @@ static void rtl8187_rx_cb(struct urb *urb)
 	unsigned long f;
 
 	spin_lock_irqsave(&priv->rx_queue.lock, f);
-	if (skb->next)
-		__skb_unlink(skb, &priv->rx_queue);
-	else {
-		spin_unlock_irqrestore(&priv->rx_queue.lock, f);
-		return;
-	}
+	__skb_unlink(skb, &priv->rx_queue);
 	spin_unlock_irqrestore(&priv->rx_queue.lock, f);
 	skb_put(skb, urb->actual_length);