---

yaml --- r: 236534 b: refs/heads/master c: f0dee9f h: refs/heads/master v: v3
git-mirror · Mar 14, 2011 · 6d1f86d · 6d1f86d
1 parent 77db1ad
commit 6d1f86d
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83970d9ba1768f1b9ad6c154872cbc08f89da062
+refs/heads/master: f0dee9f26c31363f43a643a36f1de70a073bca0e
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_core.c b/trunk/drivers/staging/rtl8192e/r8192E_core.c
@@ -830,8 +830,6 @@ static void rtl8192_hard_data_xmit(struct sk_buff *skb,
 		return;
 	}
 
-	memcpy(skb->cb, &ieee80211->dev, sizeof(ieee80211->dev));
-
 	skb_push(skb, priv->ieee80211->tx_headroom);
 	ret = rtl8192_tx(priv, skb);
 	if (ret != 0) {
@@ -865,7 +863,6 @@ static int rtl8192_hard_start_xmit(struct sk_buff *skb, struct ieee80211_device
 		}
         }
 
-        memcpy(skb->cb, &ieee80211->dev, sizeof(ieee80211->dev));
 	if (queue_index == TXCMD_QUEUE) {
 		rtl819xE_tx_cmd(priv, skb);
 		ret = 0;

diff --git a/trunk/drivers/staging/rtl8192e/r819xE_cmdpkt.c b/trunk/drivers/staging/rtl8192e/r819xE_cmdpkt.c
@@ -38,7 +38,6 @@ RT_STATUS cmpk_message_handle_tx(
 	u32	packettype,
 	u32	buffer_len)
 {
-	struct net_device *dev = priv->ieee80211->dev;
 	RT_STATUS 	    rt_status = RT_STATUS_SUCCESS;
 	u16		    frag_threshold;
 	u16		    frag_length = 0, frag_offset = 0;
@@ -75,7 +74,6 @@ RT_STATUS cmpk_message_handle_tx(
                 goto Failed;
             }
 
-            memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));
             tcb_desc = (cb_desc*)(skb->cb + MAX_DEV_ADDR_SIZE);
             tcb_desc->queue_index = TXCMD_QUEUE;
             tcb_desc->bCmdOrInit = packettype;

diff --git a/trunk/drivers/staging/rtl8192e/r819xE_firmware.c b/trunk/drivers/staging/rtl8192e/r819xE_firmware.c
@@ -39,7 +39,6 @@ void firmware_init_param(struct r8192_priv *priv)
 static bool fw_download_code(struct r8192_priv *priv, u8 *code_virtual_address,
 			     u32 buffer_len)
 {
-	struct net_device *dev = priv->ieee80211->dev;
 	bool rt_status = true;
 	u16 frag_threshold;
 	u16 frag_length, frag_offset = 0;
@@ -69,7 +68,6 @@ static bool fw_download_code(struct r8192_priv *priv, u8 *code_virtual_address,
 		 * descriptor info add 4 to avoid packet appending overflow.
 		 */
 		skb  = dev_alloc_skb(frag_length + 4);
-		memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
 		tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
 		tcb_desc->queue_index = TXCMD_QUEUE;
 		tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT;