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>

diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index b29c37fa2ef6d31789272bdd16fed48331ce48aa..58d800f1b5ee1878f66da3717677eb816cdc7e74 100644 (file)
--- 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,
                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/drivers/staging/rtl8192e/r819xE_cmdpkt.c b/drivers/staging/rtl8192e/r819xE_cmdpkt.c
index 41dcb9026dd71d6b93f33cf3049bb4b7072635bf..756e0660bbe54b3526d6786d7a28a89d2b17944f 100644 (file)
--- a/drivers/staging/rtl8192e/r819xE_cmdpkt.c
+++ b/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/drivers/staging/rtl8192e/r819xE_firmware.c b/drivers/staging/rtl8192e/r819xE_firmware.c
index 1557d8030ca8041b774854172d0bff61a20c6369..d9e8b5a08904d1da11e2d16ca8501856af925364 100644 (file)
--- 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)
 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;