staging: vt6656: struct vnt_usb_send_context remove sEthHeader.
authorMalcolm Priestley <tvboxspy@gmail.com>
Thu, 27 Feb 2014 23:06:11 +0000 (23:06 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Feb 2014 01:09:18 +0000 (17:09 -0800)
In nsDMA_tx_packet and bRelayPacketSend s_vSaveTxPktInfo points
to sEthHeader.h_dest which is the wrong viable.

Correct and point to pDevice->sTxEthHeader.

This is only relevant in the non fuctioning hostapd access point
mode, shortly to be removed from driver.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/device.h
drivers/staging/vt6656/rxtx.c

index 2574029dd05fd9f0bcf623b2e8fb143dc7db3f6f..72bcafb9de47dfad64e5dcdca6b70520ff131407 100644 (file)
@@ -179,7 +179,6 @@ struct vnt_usb_send_context {
        void *pDevice;
        struct sk_buff *pPacket;
        struct urb *pUrb;
-       struct ethhdr sEthHeader;
        unsigned int uBufLen;
        u8 type;
        bool bBoolInUse;
index ba0184a303f7b16b599a86a731c416a4cff7df05..7083af32e43c35ef7075ed7fd8e55c7366ca7dac 100644 (file)
@@ -2444,7 +2444,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice,
     pContext->uBufLen = (u16)BytesToWrite + 4 ; //USB header
 
     s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F),
-                       &pContext->sEthHeader.h_dest[0],
+                       &pDevice->sTxEthHeader.h_dest[0],
                        (u16)(BytesToWrite-uHeaderLen),
                        pTX_Buffer->fifo_head.wFIFOCtl);
 
@@ -2598,7 +2598,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen,
     pContext->uBufLen = (u16)BytesToWrite + 4 ; //USB header
 
     s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F),
-               &pContext->sEthHeader.h_dest[0],
+               &pDevice->sTxEthHeader.h_dest[0],
                (u16)(BytesToWrite - uHeaderLen),
                pTX_Buffer->fifo_head.wFIFOCtl);