There's no net_device stashed in skb->cb, there's a net_device * there.

To make it *really* clear, also change the write of the dev pointer
into skb->cb from a memcpy() to an assignment.

Fixes: 3fe563249374 ("staging: rtl8192u: r8192U_core.c: Cleaning up ...")
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
It seems abundantly clear that no developers are actually testing
this driver.  (And I'm continuing that tradition.)  Given that it
has spent 2 years with what appears to be a fatal bug, I think it
may be time to give up and remove it rather than continuing to
'clean up'.

Ben.

 drivers/staging/rtl8192u/r8192U_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8192u/r8192U_core.c 
b/drivers/staging/rtl8192u/r8192U_core.c
index 849a95ef723c..2c780cac7dd0 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -1050,7 +1050,7 @@ static void rtl8192_hard_data_xmit(struct sk_buff *skb, 
struct net_device *dev,
 
        spin_lock_irqsave(&priv->tx_lock, flags);
 
-       memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
+       *(struct net_device **)(skb->cb) = dev;
        tcb_desc->bTxEnableFwCalcDur = 1;
        skb_push(skb, priv->ieee80211->tx_headroom);
        ret = rtl8192_tx(dev, skb);
@@ -1100,7 +1100,7 @@ static void rtl8192_tx_isr(struct urb *tx_urb)
        if (!skb)
                return;
 
-       dev = (struct net_device *)(skb->cb);
+       dev = *(struct net_device **)(skb->cb);
        tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
        queue_index = tcb_desc->queue_index;
 

Attachment: signature.asc
Description: Digital signature

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to