diff options
| author | Andres More | 2013-03-19 02:33:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-03-25 19:06:09 +0100 |
| commit | ceb8c5dabcfa586c7e87b9acc999f1c08d2f612a (patch) | |
| tree | 0976f6067512d75f648641f2830eb9c6072cd966 /drivers/staging/vt6656/dpc.c | |
| parent | staging: ste_rmi4: Make synaptics_rmi4_touchpad_config symbol static (diff) | |
| download | kernel-qcow2-linux-ceb8c5dabcfa586c7e87b9acc999f1c08d2f612a.tar.gz kernel-qcow2-linux-ceb8c5dabcfa586c7e87b9acc999f1c08d2f612a.tar.xz kernel-qcow2-linux-ceb8c5dabcfa586c7e87b9acc999f1c08d2f612a.zip | |
staging: vt6656: removed usage of custom Ethernet header
Removed struct tagSEthernetHeader, replacing with struct ethhdr.
Not all checkpatch errors and warnings were removed.
Signed-off-by: Andres More <more.andres@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/dpc.c')
| -rw-r--r-- | drivers/staging/vt6656/dpc.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index 66ce1952c6bd..66266a9f1099 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -81,7 +81,7 @@ void s_vGetDASA( u8 * pbyRxBufferAddr, unsigned int *pcbHeaderSize, - PSEthernetHeader psEthHeader + struct ethhdr *psEthHeader ); static void s_vProcessRxMACHeader(struct vnt_private *pDevice, @@ -190,9 +190,9 @@ static void s_vProcessRxMACHeader(struct vnt_private *pDevice, cbHeaderSize -= (ETH_ALEN * 2); pbyRxBuffer = (u8 *) (pbyRxBufferAddr + cbHeaderSize); for (ii = 0; ii < ETH_ALEN; ii++) - *pbyRxBuffer++ = pDevice->sRxEthHeader.abyDstAddr[ii]; + *pbyRxBuffer++ = pDevice->sRxEthHeader.h_dest[ii]; for (ii = 0; ii < ETH_ALEN; ii++) - *pbyRxBuffer++ = pDevice->sRxEthHeader.abySrcAddr[ii]; + *pbyRxBuffer++ = pDevice->sRxEthHeader.h_source[ii]; *pcbHeadSize = cbHeaderSize; } @@ -217,7 +217,7 @@ void s_vGetDASA ( u8 * pbyRxBufferAddr, unsigned int *pcbHeaderSize, - PSEthernetHeader psEthHeader + struct ethhdr *psEthHeader ) { unsigned int cbHeaderSize = 0; @@ -229,17 +229,17 @@ s_vGetDASA ( if ((pMACHeader->wFrameCtl & FC_TODS) == 0) { if (pMACHeader->wFrameCtl & FC_FROMDS) { for (ii = 0; ii < ETH_ALEN; ii++) { - psEthHeader->abyDstAddr[ii] = + psEthHeader->h_dest[ii] = pMACHeader->abyAddr1[ii]; - psEthHeader->abySrcAddr[ii] = + psEthHeader->h_source[ii] = pMACHeader->abyAddr3[ii]; } } else { /* IBSS mode */ for (ii = 0; ii < ETH_ALEN; ii++) { - psEthHeader->abyDstAddr[ii] = + psEthHeader->h_dest[ii] = pMACHeader->abyAddr1[ii]; - psEthHeader->abySrcAddr[ii] = + psEthHeader->h_source[ii] = pMACHeader->abyAddr2[ii]; } } @@ -247,17 +247,17 @@ s_vGetDASA ( /* Is AP mode.. */ if (pMACHeader->wFrameCtl & FC_FROMDS) { for (ii = 0; ii < ETH_ALEN; ii++) { - psEthHeader->abyDstAddr[ii] = + psEthHeader->h_dest[ii] = pMACHeader->abyAddr3[ii]; - psEthHeader->abySrcAddr[ii] = + psEthHeader->h_source[ii] = pMACHeader->abyAddr4[ii]; cbHeaderSize += 6; } } else { for (ii = 0; ii < ETH_ALEN; ii++) { - psEthHeader->abyDstAddr[ii] = + psEthHeader->h_dest[ii] = pMACHeader->abyAddr3[ii]; - psEthHeader->abySrcAddr[ii] = + psEthHeader->h_source[ii] = pMACHeader->abyAddr2[ii]; } } @@ -407,7 +407,7 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB, // Use for TKIP MIC s_vGetDASA(pbyFrame, &cbHeaderSize, &pDevice->sRxEthHeader); - if (!compare_ether_addr((u8 *)&(pDevice->sRxEthHeader.abySrcAddr[0]), + if (!compare_ether_addr((u8 *)&(pDevice->sRxEthHeader.h_source[0]), pDevice->abyCurrentNetAddr)) return false; @@ -776,7 +776,7 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB, } MIC_vInit(dwMICKey0, dwMICKey1); - MIC_vAppend((u8 *)&(pDevice->sRxEthHeader.abyDstAddr[0]), 12); + MIC_vAppend((u8 *)&(pDevice->sRxEthHeader.h_dest[0]), 12); dwMIC_Priority = 0; MIC_vAppend((u8 *)&dwMIC_Priority, 4); // 4 is Rcv buffer header, 24 is MAC Header, and 8 is IV and Ext IV. |