Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0dee9f2 authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 83970d9b

drivers/staging/rtl8192e/r8192E_core.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

drivers/staging/rtl8192e/r819xE_cmdpkt.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/rtl8192e/r819xE_firmware.c

+0 −2
Original line number Diff line number Diff line
@@ -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;