lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8192e: Don't copy dev pointer to skb

Browse Source 
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mike McCormack
2011-03-10 22:41:06 +09:00
committed by Greg Kroah-Hartman
parent 83970d9ba1
commit f0dee9f26c
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/rtl8192e/r8192E_core.c
View File

@@ -830,8 +830,6 @@ static void rtl8192_hard_data_xmit(struct sk_buff *skb,
return; return;
} }
memcpy(skb->cb, &ieee80211->dev, sizeof(ieee80211->dev));
skb_push(skb, priv->ieee80211->tx_headroom); skb_push(skb, priv->ieee80211->tx_headroom);
ret = rtl8192_tx(priv, skb); ret = rtl8192_tx(priv, skb);
if (ret != 0) { 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) { if (queue_index == TXCMD_QUEUE) {
rtl819xE_tx_cmd(priv, skb); rtl819xE_tx_cmd(priv, skb);
ret = 0; ret = 0;

2
drivers/staging/rtl8192e/r819xE_cmdpkt.c
View File

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

2
drivers/staging/rtl8192e/r819xE_firmware.c
View File

@@ -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, static bool fw_download_code(struct r8192_priv *priv, u8 *code_virtual_address,
u32 buffer_len) u32 buffer_len)
{ {
struct net_device *dev = priv->ieee80211->dev;
bool rt_status = true; bool rt_status = true;
u16 frag_threshold; u16 frag_threshold;
u16 frag_length, frag_offset = 0; 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. * descriptor info add 4 to avoid packet appending overflow.
*/ */
skb = dev_alloc_skb(frag_length + 4); 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 = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
tcb_desc->queue_index = TXCMD_QUEUE; tcb_desc->queue_index = TXCMD_QUEUE;
tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT; tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT;