Removed functions MACvSetMultiAddrByHash(), MACvSetMISCFifo(), and ETHbyGetHashIndexByCrc32(), also struct tagS802_3Header. Signed-off-by: Andres More <more.andres@xxxxxxxxx> --- drivers/staging/vt6656/mac.c | 65 --------------------------------------- drivers/staging/vt6656/mac.h | 2 - drivers/staging/vt6656/tether.c | 37 ---------------------- drivers/staging/vt6656/tether.h | 12 ------- 4 files changed, 0 insertions(+), 116 deletions(-) diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c index 76d307b..1234f1e 100644 --- a/drivers/staging/vt6656/mac.c +++ b/drivers/staging/vt6656/mac.c @@ -51,51 +51,6 @@ static int msglevel =MSG_LEVEL_INFO; /*--------------------- Export Functions --------------------------*/ - - - - -/* - * Description: - * Set this hash index into multicast address register bit - * - * Parameters: - * In: - * byHashIdx - Hash index to set - * Out: - * none - * - * Return Value: none - * - */ -void MACvSetMultiAddrByHash(struct vnt_private *pDevice, u8 byHashIdx) -{ - u8 uByteIdx; - u8 byBitMask; - u8 pbyData[2]; - - - // calculate byte position - uByteIdx = byHashIdx / 8; - - // calculate bit position - byBitMask = 1; - byBitMask <<= (byHashIdx % 8); - // turn on the bit - - pbyData[0] = byBitMask; - pbyData[1] = byBitMask; - - CONTROLnsRequestOut(pDevice, - MESSAGE_TYPE_WRITE_MASK, - (WORD) (MAC_REG_MAR0 + uByteIdx), - MESSAGE_REQUEST_MACREG, - 2, - pbyData); -} - - - /* * Description: * Write MAC Multicast Address Mask @@ -163,26 +118,6 @@ void MACvSetBBType(struct vnt_private *pDevice, u8 byType) ); } -void MACvSetMISCFifo(struct vnt_private *pDevice, u16 wOffset, u32 dwData) -{ - u8 pbyData[4]; - - if (wOffset > 273) - return; - pbyData[0] = (BYTE)dwData; - pbyData[1] = (BYTE)(dwData>>8); - pbyData[2] = (BYTE)(dwData>>16); - pbyData[3] = (BYTE)(dwData>>24); - - CONTROLnsRequestOut(pDevice, - MESSAGE_TYPE_WRITE_MISCFF, - wOffset, - 0, - 4, - pbyData - ); -} - /* * Description: * Disable the Key Entry by MISCFIFO diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h index 6e28500..a65ec3a 100644 --- a/drivers/staging/vt6656/mac.h +++ b/drivers/staging/vt6656/mac.h @@ -420,11 +420,9 @@ /*--------------------- Export Functions --------------------------*/ -void MACvSetMultiAddrByHash(struct vnt_private *, u8); void MACvWriteMultiAddr(struct vnt_private *, u32, u8); void MACbShutdown(struct vnt_private *); void MACvSetBBType(struct vnt_private *, u8); -void MACvSetMISCFifo(struct vnt_private *pDevice, u16, u32); void MACvDisableKeyEntry(struct vnt_private *, u32); void MACvSetKeyEntry(struct vnt_private *, u16, u32, u32, u8 *, u32 *); void MACvRegBitsOff(struct vnt_private *, u8, u8); diff --git a/drivers/staging/vt6656/tether.c b/drivers/staging/vt6656/tether.c index 95286c4..bbec0cc 100644 --- a/drivers/staging/vt6656/tether.c +++ b/drivers/staging/vt6656/tether.c @@ -25,7 +25,6 @@ * Date: May 21, 1996 * * Functions: - * ETHbyGetHashIndexByCrc32 - Calculate multicast hash value by CRC32 * ETHbIsBufferCrc32Ok - Check CRC value of the buffer if Ok or not * * Revision History: @@ -47,42 +46,6 @@ /*--------------------- Export Variables --------------------------*/ - - -/* - * Description: Calculate multicast hash value by CRC32 - * - * Parameters: - * In: - * pbyMultiAddr - Multicast Address - * Out: - * none - * - * Return Value: Hash value - * - */ -BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr) -{ - int ii; - BYTE byTmpHash; - BYTE byHash = 0; - - /* get the least 6-bits from CRC generator */ - byTmpHash = (BYTE)(CRCdwCrc32(pbyMultiAddr, ETH_ALEN, - 0xFFFFFFFFL) & 0x3F); - /* reverse most bit to least bit */ - for (ii = 0; ii < (sizeof(byTmpHash) * 8); ii++) { - byHash <<= 1; - if (byTmpHash & 0x01) - byHash |= 1; - byTmpHash >>= 1; - } - - /* adjust 6-bits to the right most */ - return byHash >> 2; -} - - /* * Description: Check CRC value of the buffer if Ok or not * diff --git a/drivers/staging/vt6656/tether.h b/drivers/staging/vt6656/tether.h index 2f8f485..5cc33fe 100644 --- a/drivers/staging/vt6656/tether.h +++ b/drivers/staging/vt6656/tether.h @@ -126,17 +126,6 @@ typedef struct tagSEthernetHeader { } __attribute__ ((__packed__)) SEthernetHeader, *PSEthernetHeader; - -// -// 802_3 packet -// -typedef struct tagS802_3Header { - BYTE abyDstAddr[ETH_ALEN]; - BYTE abySrcAddr[ETH_ALEN]; - WORD wLen; -} __attribute__ ((__packed__)) -S802_3Header, *PS802_3Header; - // // 802_11 packet // @@ -159,7 +148,6 @@ S802_11Header, *PS802_11Header; /*--------------------- Export Functions --------------------------*/ -BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr); //BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr); bool ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, unsigned int cbFrameLength); -- 1.7.2.5 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel