---

yaml --- r: 369068 b: refs/heads/master c: d7d0f08 h: refs/heads/master v: v3
git-mirror · Mar 25, 2013 · 597e7b1 · 597e7b1
1 parent dd96639
commit 597e7b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 872de8ff04922e4ad95c5af39131ae9fbefe6ac5
+refs/heads/master: d7d0f081c48951018133cac38c8c0796f37db727
diff --git a/trunk/drivers/net/wireless/rtlwifi/usb.c b/trunk/drivers/net/wireless/rtlwifi/usb.c
@@ -513,22 +513,11 @@ static void _rtl_usb_rx_process_noagg(struct ieee80211_hw *hw,
 			if (unicast)
 				rtlpriv->link_info.num_rx_inperiod++;
 		}
-		if (likely(rtl_action_proc(hw, skb, false))) {
-			struct sk_buff *uskb = NULL;
-			u8 *pdata;
-
-			uskb = dev_alloc_skb(skb->len + 128);
-			if (uskb) {	/* drop packet on allocation failure */
-				memcpy(IEEE80211_SKB_RXCB(uskb), &rx_status,
-				       sizeof(rx_status));
-				pdata = (u8 *)skb_put(uskb, skb->len);
-				memcpy(pdata, skb->data, skb->len);
-				ieee80211_rx_irqsafe(hw, uskb);
-			}
-			dev_kfree_skb_any(skb);
-		} else {
+
+		if (likely(rtl_action_proc(hw, skb, false)))
+			ieee80211_rx_irqsafe(hw, skb);
+		else
 			dev_kfree_skb_any(skb);
-		}
 	}
 }