From 81aec60ed7c2578628dc7362cc51f33285b1f4f9 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Thu, 27 Feb 2014 23:06:11 +0000 Subject: [PATCH] staging: vt6656: struct vnt_usb_send_context remove sEthHeader. 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/device.h | 1 - drivers/staging/vt6656/rxtx.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 2574029dd05..72bcafb9de4 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -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; diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index ba0184a303f..7083af32e43 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -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); -- 2.46.0