aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e
diff options
context:
space:
mode:
authorMike McCormack <mikem@ring3k.org>2011-03-10 08:41:06 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-14 15:24:48 -0400
commitf0dee9f26c31363f43a643a36f1de70a073bca0e (patch)
tree45a6c95299f9f397cf8e2f245b0b8df0fdcbf669 /drivers/staging/rtl8192e
parent83970d9ba1768f1b9ad6c154872cbc08f89da062 (diff)
staging: rtl8192e: Don't copy dev pointer to skb
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e')
-rw-r--r--drivers/staging/rtl8192e/r8192E_core.c3
-rw-r--r--drivers/staging/rtl8192e/r819xE_cmdpkt.c2
-rw-r--r--drivers/staging/rtl8192e/r819xE_firmware.c2
3 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index b29c37fa2ef..58d800f1b5e 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -830,8 +830,6 @@ static void rtl8192_hard_data_xmit(struct sk_buff *skb,
830 return; 830 return;
831 } 831 }
832 832
833 memcpy(skb->cb, &ieee80211->dev, sizeof(ieee80211->dev));
834
835 skb_push(skb, priv->ieee80211->tx_headroom); 833 skb_push(skb, priv->ieee80211->tx_headroom);
836 ret = rtl8192_tx(priv, skb); 834 ret = rtl8192_tx(priv, skb);
837 if (ret != 0) { 835 if (ret != 0) {
@@ -865,7 +863,6 @@ static int rtl8192_hard_start_xmit(struct sk_buff *skb, struct ieee80211_device
865 } 863 }
866 } 864 }
867 865
868 memcpy(skb->cb, &ieee80211->dev, sizeof(ieee80211->dev));
869 if (queue_index == TXCMD_QUEUE) { 866 if (queue_index == TXCMD_QUEUE) {
870 rtl819xE_tx_cmd(priv, skb); 867 rtl819xE_tx_cmd(priv, skb);
871 ret = 0; 868 ret = 0;
diff --git a/drivers/staging/rtl8192e/r819xE_cmdpkt.c b/drivers/staging/rtl8192e/r819xE_cmdpkt.c
index 41dcb9026dd..756e0660bbe 100644
--- a/drivers/staging/rtl8192e/r819xE_cmdpkt.c
+++ b/drivers/staging/rtl8192e/r819xE_cmdpkt.c
@@ -38,7 +38,6 @@ RT_STATUS cmpk_message_handle_tx(
38 u32 packettype, 38 u32 packettype,
39 u32 buffer_len) 39 u32 buffer_len)
40{ 40{
41 struct net_device *dev = priv->ieee80211->dev;
42 RT_STATUS rt_status = RT_STATUS_SUCCESS; 41 RT_STATUS rt_status = RT_STATUS_SUCCESS;
43 u16 frag_threshold; 42 u16 frag_threshold;
44 u16 frag_length = 0, frag_offset = 0; 43 u16 frag_length = 0, frag_offset = 0;
@@ -75,7 +74,6 @@ RT_STATUS cmpk_message_handle_tx(
75 goto Failed; 74 goto Failed;
76 } 75 }
77 76
78 memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));
79 tcb_desc = (cb_desc*)(skb->cb + MAX_DEV_ADDR_SIZE); 77 tcb_desc = (cb_desc*)(skb->cb + MAX_DEV_ADDR_SIZE);
80 tcb_desc->queue_index = TXCMD_QUEUE; 78 tcb_desc->queue_index = TXCMD_QUEUE;
81 tcb_desc->bCmdOrInit = packettype; 79 tcb_desc->bCmdOrInit = packettype;
diff --git a/drivers/staging/rtl8192e/r819xE_firmware.c b/drivers/staging/rtl8192e/r819xE_firmware.c
index 1557d8030ca..d9e8b5a0890 100644
--- a/drivers/staging/rtl8192e/r819xE_firmware.c
+++ b/drivers/staging/rtl8192e/r819xE_firmware.c
@@ -39,7 +39,6 @@ void firmware_init_param(struct r8192_priv *priv)
39static bool fw_download_code(struct r8192_priv *priv, u8 *code_virtual_address, 39static bool fw_download_code(struct r8192_priv *priv, u8 *code_virtual_address,
40 u32 buffer_len) 40 u32 buffer_len)
41{ 41{
42 struct net_device *dev = priv->ieee80211->dev;
43 bool rt_status = true; 42 bool rt_status = true;
44 u16 frag_threshold; 43 u16 frag_threshold;
45 u16 frag_length, frag_offset = 0; 44 u16 frag_length, frag_offset = 0;
@@ -69,7 +68,6 @@ static bool fw_download_code(struct r8192_priv *priv, u8 *code_virtual_address,
69 * descriptor info add 4 to avoid packet appending overflow. 68 * descriptor info add 4 to avoid packet appending overflow.
70 */ 69 */
71 skb = dev_alloc_skb(frag_length + 4); 70 skb = dev_alloc_skb(frag_length + 4);
72 memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
73 tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); 71 tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
74 tcb_desc->queue_index = TXCMD_QUEUE; 72 tcb_desc->queue_index = TXCMD_QUEUE;
75 tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT; 73 tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT;