Commit e1970fce authored by Andres More's avatar Andres More Committed by Greg Kroah-Hartman

staging: vt6656: remove unused functions

Removed defined symbols not being used elsewhere.
Only compile tested.
Signed-off-by: default avatarAndres More <more.andres@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d88fe15b
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
* Functions: * Functions:
* vMgrEncodeBeacon - Encode the Beacon frame * vMgrEncodeBeacon - Encode the Beacon frame
* vMgrDecodeBeacon - Decode the Beacon frame * vMgrDecodeBeacon - Decode the Beacon frame
* vMgrEncodeIBSSATIM - Encode the IBSS ATIM frame
* vMgrDecodeIBSSATIM - Decode the IBSS ATIM frame
* vMgrEncodeDisassociation - Encode the Disassociation frame * vMgrEncodeDisassociation - Encode the Disassociation frame
* vMgrDecodeDisassociation - Decode the Disassociation frame * vMgrDecodeDisassociation - Decode the Disassociation frame
* vMgrEncodeAssocRequest - Encode the Association request frame * vMgrEncodeAssocRequest - Encode the Association request frame
...@@ -46,7 +44,6 @@ ...@@ -46,7 +44,6 @@
* vMgrEncodeDeauthen - Encode the DeAuthentication frame * vMgrEncodeDeauthen - Encode the DeAuthentication frame
* vMgrDecodeDeauthen - Decode the DeAuthentication frame * vMgrDecodeDeauthen - Decode the DeAuthentication frame
* vMgrEncodeReassocResponse - Encode the Reassociation response frame * vMgrEncodeReassocResponse - Encode the Reassociation response frame
* vMgrDecodeReassocResponse - Decode the Reassociation response frame
* *
* Revision History: * Revision History:
* *
...@@ -222,49 +219,6 @@ vMgrDecodeBeacon( ...@@ -222,49 +219,6 @@ vMgrDecodeBeacon(
} }
} }
/*+
*
* Routine Description:
* Encode IBSS ATIM
*
*
* Return Value:
* None.
*
-*/
void
vMgrEncodeIBSSATIM(
PWLAN_FR_IBSSATIM pFrame
)
{
pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
pFrame->len = WLAN_HDR_ADDR3_LEN;
}
/*+
*
* Routine Description:
* Decode IBSS ATIM
*
*
* Return Value:
* None.
*
-*/
void
vMgrDecodeIBSSATIM(
PWLAN_FR_IBSSATIM pFrame
)
{
pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
}
/*+ /*+
* *
* Routine Description: * Routine Description:
...@@ -938,44 +892,3 @@ vMgrEncodeReassocResponse( ...@@ -938,44 +892,3 @@ vMgrEncodeReassocResponse(
pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_REASSOCRESP_OFF_AID + sizeof(*(pFrame->pwAid)); pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_REASSOCRESP_OFF_AID + sizeof(*(pFrame->pwAid));
} }
/*+
*
* Routine Description:
* Decode Reassociation Response
*
*
* Return Value:
* None.
*
-*/
void
vMgrDecodeReassocResponse(
PWLAN_FR_REASSOCRESP pFrame
)
{
PWLAN_IE pItem;
pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
/* Fixed Fields */
pFrame->pwCapInfo = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_REASSOCRESP_OFF_CAP_INFO);
pFrame->pwStatus = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_REASSOCRESP_OFF_STATUS);
pFrame->pwAid = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_REASSOCRESP_OFF_AID);
/* Information elements */
pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_REASSOCRESP_OFF_SUPP_RATES);
pItem = (PWLAN_IE)(pFrame->pSuppRates);
pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len);
if ((((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES))
pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;
}
...@@ -726,16 +726,6 @@ vMgrDecodeBeacon( ...@@ -726,16 +726,6 @@ vMgrDecodeBeacon(
PWLAN_FR_BEACON pFrame PWLAN_FR_BEACON pFrame
); );
void
vMgrEncodeIBSSATIM(
PWLAN_FR_IBSSATIM pFrame
);
void
vMgrDecodeIBSSATIM(
PWLAN_FR_IBSSATIM pFrame
);
void void
vMgrEncodeDisassociation( vMgrEncodeDisassociation(
PWLAN_FR_DISASSOC pFrame PWLAN_FR_DISASSOC pFrame
...@@ -821,9 +811,4 @@ vMgrEncodeReassocResponse( ...@@ -821,9 +811,4 @@ vMgrEncodeReassocResponse(
PWLAN_FR_REASSOCRESP pFrame PWLAN_FR_REASSOCRESP pFrame
); );
void
vMgrDecodeReassocResponse(
PWLAN_FR_REASSOCRESP pFrame
);
#endif /* __80211MGR_H__ */ #endif /* __80211MGR_H__ */
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
* BBuGetFrameTime - Calculate data frame transmitting time * BBuGetFrameTime - Calculate data frame transmitting time
* BBvCalculateParameter - Calculate PhyLength, PhyService and Phy Signal parameter for baseband Tx * BBvCalculateParameter - Calculate PhyLength, PhyService and Phy Signal parameter for baseband Tx
* BBbVT3184Init - VIA VT3184 baseband chip init code * BBbVT3184Init - VIA VT3184 baseband chip init code
* BBvLoopbackOn - Turn on BaseBand Loopback mode
* BBvLoopbackOff - Turn off BaseBand Loopback mode
* *
* Revision History: * Revision History:
* *
...@@ -1129,96 +1127,6 @@ else { ...@@ -1129,96 +1127,6 @@ else {
return true;//ntStatus; return true;//ntStatus;
} }
/*
* Description: Turn on BaseBand Loopback mode
*
* Parameters:
* In:
* pDevice - Device Structure
*
* Out:
* none
*
* Return Value: none
*
*/
void BBvLoopbackOn(struct vnt_private *pDevice)
{
u8 byData;
//CR C9 = 0x00
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0xC9, &pDevice->byBBCRc9);//CR201
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0xC9, 0);
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x4D, &pDevice->byBBCR4d);//CR77
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x4D, 0x90);
//CR 88 = 0x02(CCK), 0x03(OFDM)
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x88, &pDevice->byBBCR88);//CR136
if (pDevice->wCurrentRate <= RATE_11M) { //CCK
// Enable internal digital loopback: CR33 |= 0000 0001
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x21, &byData);//CR33
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x21, (u8)(byData | 0x01));//CR33
// CR154 = 0x00
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9A, 0); //CR154
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x88, 0x02);//CR239
}
else { //OFDM
// Enable internal digital loopback:CR154 |= 0000 0001
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x9A, &byData);//CR154
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9A, (u8)(byData | 0x01));//CR154
// CR33 = 0x00
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x21, 0); //CR33
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x88, 0x03);//CR239
}
//CR14 = 0x00
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0E, 0);//CR14
// Disable TX_IQUN
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x09, &pDevice->byBBCR09);
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x09, (u8)(pDevice->byBBCR09 & 0xDE));
}
/*
* Description: Turn off BaseBand Loopback mode
*
* Parameters:
* In:
* pDevice - Device Structure
*
* Out:
* none
*
* Return Value: none
*
*/
void BBvLoopbackOff(struct vnt_private *pDevice)
{
u8 byData;
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0xC9, pDevice->byBBCRc9);//CR201
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x88, pDevice->byBBCR88);//CR136
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x09, pDevice->byBBCR09);//CR136
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x4D, pDevice->byBBCR4d);//CR77
if (pDevice->wCurrentRate <= RATE_11M) { // CCK
// Set the CR33 Bit2 to disable internal Loopback.
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x21, &byData);//CR33
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x21, (u8)(byData & 0xFE));//CR33
} else { /* OFDM */
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x9A, &byData);//CR154
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9A, (u8)(byData & 0xFE));//CR154
}
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x0E, &byData);//CR14
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0E, (u8)(byData | 0x80));//CR14
}
/* /*
* Description: Set ShortSlotTime mode * Description: Set ShortSlotTime mode
* *
...@@ -1262,27 +1170,6 @@ void BBvSetVGAGainOffset(struct vnt_private *pDevice, u8 byData) ...@@ -1262,27 +1170,6 @@ void BBvSetVGAGainOffset(struct vnt_private *pDevice, u8 byData)
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0A, pDevice->byBBRxConf);//CR10 ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0A, pDevice->byBBRxConf);//CR10
} }
/*
* Description: Baseband SoftwareReset
*
* Parameters:
* In:
* dwIoBase - I/O base address
* Out:
* none
*
* Return Value: none
*
*/
void BBvSoftwareReset(struct vnt_private *pDevice)
{
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x50, 0x40);
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x50, 0);
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9C, 0x01);
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9C, 0);
}
/* /*
* Description: BBvSetDeepSleep * Description: BBvSetDeepSleep
* *
......
...@@ -106,9 +106,6 @@ void TimerSQ3CallBack(struct vnt_private *); ...@@ -106,9 +106,6 @@ void TimerSQ3CallBack(struct vnt_private *);
void TimerSQ3Tmax3CallBack(struct vnt_private *); void TimerSQ3Tmax3CallBack(struct vnt_private *);
void BBvAntennaDiversity(struct vnt_private *, u8 byRxRate, u8 bySQ3); void BBvAntennaDiversity(struct vnt_private *, u8 byRxRate, u8 bySQ3);
void BBvLoopbackOn(struct vnt_private *);
void BBvLoopbackOff(struct vnt_private *);
void BBvSoftwareReset(struct vnt_private *);
void BBvSetShortSlotTime(struct vnt_private *); void BBvSetShortSlotTime(struct vnt_private *);
void BBvSetVGAGainOffset(struct vnt_private *, u8 byData); void BBvSetVGAGainOffset(struct vnt_private *, u8 byData);
......
...@@ -1009,44 +1009,3 @@ void CARDvSetBSSMode(struct vnt_private *pDevice) ...@@ -1009,44 +1009,3 @@ void CARDvSetBSSMode(struct vnt_private *pDevice)
pDevice->abyBBVGA[3] = 0x0; pDevice->abyBBVGA[3] = 0x0;
} }
} }
/*
*
* Description:
* Do Channel Switch defined in 802.11h
*
* Parameters:
* In:
* hDeviceContext - device structure point
* Out:
* none
*
* Return Value: none.
*
-*/
int CARDbChannelSwitch(struct vnt_private *pDevice, u8 byMode,
u8 byNewChannel, u8 byCount)
{
int bResult = true;
if (byCount == 0) {
pDevice->vnt_mgmt.uCurrChannel = byNewChannel;
CARDbSetMediaChannel(pDevice, byNewChannel);
return bResult;
}
pDevice->byChannelSwitchCount = byCount;
pDevice->byNewChannel = byNewChannel;
pDevice->bChannelSwitch = true;
if (byMode == 1) {
//bResult=CARDbStopTxPacket(pDevice, PKT_TYPE_802_11_ALL);
pDevice->bStopDataPkt = true;
}
return bResult;
}
...@@ -74,7 +74,5 @@ int CARDbRadioPowerOff(struct vnt_private *pDevice); ...@@ -74,7 +74,5 @@ int CARDbRadioPowerOff(struct vnt_private *pDevice);
int CARDbRadioPowerOn(struct vnt_private *pDevice); int CARDbRadioPowerOn(struct vnt_private *pDevice);
u8 CARDbyGetPktType(struct vnt_private *pDevice); u8 CARDbyGetPktType(struct vnt_private *pDevice);
void CARDvSetBSSMode(struct vnt_private *pDevice); void CARDvSetBSSMode(struct vnt_private *pDevice);
int CARDbChannelSwitch(struct vnt_private *pDevice, u8 byMode,
u8 byNewChannel, u8 byCount);
#endif /* __CARD_H__ */ #endif /* __CARD_H__ */
...@@ -406,32 +406,6 @@ ChannelValid(unsigned int CountryCode, unsigned int ChannelIndex) ...@@ -406,32 +406,6 @@ ChannelValid(unsigned int CountryCode, unsigned int ChannelIndex)
} /* end ChannelValid */ } /* end ChannelValid */
/************************************************************************
* CHvChannelGetList
* Get Available Channel List for a given country
* Input:
* CountryCode = The country code defined in country.h
* Output:
* ChannelBitMask = (QWORD *) correspondent bit mask
* of available channels
* 0x0000000000000001 means channel 1 is supported
* 0x0000000000000003 means channel 1,2 are supported
* 0x000000000000000F means channel 1,2,..15 are supported
************************************************************************/
bool
CHvChannelGetList (
unsigned int uCountryCodeIdx,
u8 * pbyChannelTable
)
{
if (uCountryCodeIdx >= CCODE_MAX) {
return (false);
}
memcpy(pbyChannelTable, ChannelRuleTab[uCountryCodeIdx].bChannelIdxList, CB_MAX_CHANNEL);
return (true);
}
void CHvInitChannelTable(struct vnt_private *pDevice) void CHvInitChannelTable(struct vnt_private *pDevice)
{ {
int bMultiBand = false; int bMultiBand = false;
...@@ -503,15 +477,3 @@ void CHvInitChannelTable(struct vnt_private *pDevice) ...@@ -503,15 +477,3 @@ void CHvInitChannelTable(struct vnt_private *pDevice)
}*/ }*/
} }
} }
u8 CHbyGetChannelMapping(u8 byChannelNumber)
{
u8 ii;
u8 byCHMapping = 0;
for (ii = 1; ii <= CB_MAX_CHANNEL; ii++) {
if (sChannelTbl[ii].byChannelNumber == byChannelNumber)
byCHMapping = ii;
}
return byCHMapping;
}
...@@ -44,8 +44,5 @@ typedef struct tagSChannelTblElement { ...@@ -44,8 +44,5 @@ typedef struct tagSChannelTblElement {
bool ChannelValid(unsigned int CountryCode, unsigned int ChannelNum); bool ChannelValid(unsigned int CountryCode, unsigned int ChannelNum);
void CHvInitChannelTable(struct vnt_private *pDevice); void CHvInitChannelTable(struct vnt_private *pDevice);
u8 CHbyGetChannelMapping(u8 byChannelNumber);
bool CHvChannelGetList(unsigned int uCountryCodeIdx, u8 * pbyChannelTable);
#endif /* _CHANNEL_H_ */ #endif /* _CHANNEL_H_ */
...@@ -77,40 +77,6 @@ void s_vResetCounter(PKnownNodeDB psNodeDBTable) ...@@ -77,40 +77,6 @@ void s_vResetCounter(PKnownNodeDB psNodeDBTable)
/*+
*
* Description:
* Get RateIdx from the value in SuppRates IE or ExtSuppRates IE
*
* Parameters:
* In:
* u8 - Rate value in SuppRates IE or ExtSuppRates IE
* Out:
* none
*
* Return Value: RateIdx
*
-*/
u8
DATARATEbyGetRateIdx (
u8 byRate
)
{
u8 ii;
/* erase BasicRate flag */
byRate = byRate & 0x7F;
for (ii = 0; ii < MAX_RATE; ii ++) {
if (acbyIERate[ii] == byRate)
return ii;
}
return 0;
}
/*+ /*+
* *
* Routine Description: * Routine Description:
......
...@@ -84,10 +84,4 @@ RATEwGetRateIdx( ...@@ -84,10 +84,4 @@ RATEwGetRateIdx(
u8 byRate u8 byRate
); );
u8
DATARATEbyGetRateIdx(
u8 byRate
);
#endif /* __DATARATE_H__ */ #endif /* __DATARATE_H__ */
...@@ -472,45 +472,6 @@ int KeybRemoveAllKey(struct vnt_private *pDevice, PSKeyManagement pTable, ...@@ -472,45 +472,6 @@ int KeybRemoveAllKey(struct vnt_private *pDevice, PSKeyManagement pTable,
return (false); return (false);
} }
/*
* Description: Remove WEP Key from table
*
* Parameters:
* In:
* pTable - Pointer to Key table
* Out:
* none
*
* Return Value: true if success otherwise false
*
*/
void KeyvRemoveWEPKey(struct vnt_private *pDevice, PSKeyManagement pTable,
u32 dwKeyIndex)
{
if ((dwKeyIndex & 0x000000FF) < MAX_GROUP_KEY) {
if (pTable->KeyTable[MAX_KEY_TABLE-1].bInUse == true) {
if (pTable->KeyTable[MAX_KEY_TABLE-1].GroupKey[dwKeyIndex & 0x000000FF].byCipherSuite == KEY_CTL_WEP) {
pTable->KeyTable[MAX_KEY_TABLE-1].GroupKey[dwKeyIndex & 0x000000FF].bKeyValid = false;
if ((dwKeyIndex & 0x7FFFFFFF) == (pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex & 0x7FFFFFFF)) {
// remove Group transmit key
pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex = 0;
}
}
}
s_vCheckKeyTableValid(pDevice, pTable);
}
return;
}
void KeyvRemoveAllWEPKey(struct vnt_private *pDevice, PSKeyManagement pTable)
{
int i;
for (i = 0; i < MAX_GROUP_KEY; i++)
KeyvRemoveWEPKey(pDevice, pTable, i);
}
/* /*
* Description: Get Transmit Key from table * Description: Get Transmit Key from table
* *
...@@ -589,35 +550,6 @@ int KeybGetTransmitKey(PSKeyManagement pTable, u8 *pbyBSSID, u32 dwKeyType, ...@@ -589,35 +550,6 @@ int KeybGetTransmitKey(PSKeyManagement pTable, u8 *pbyBSSID, u32 dwKeyType,
return (false); return (false);
} }
/*
* Description: Check Pairwise Key
*
* Parameters:
* In:
* pTable - Pointer to Key table
* Out:
* none
*
* Return Value: true if found otherwise false
*
*/
int KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey)
{
int i;
*pKey = NULL;
for (i=0;i<MAX_KEY_TABLE;i++) {
if ((pTable->KeyTable[i].bInUse == true) &&
(pTable->KeyTable[i].PairwiseKey.bKeyValid == true)) {
*pKey = &(pTable->KeyTable[i].PairwiseKey);
return (true);
}
}
return (false);
}
/* /*
* Description: Set Key to table * Description: Set Key to table
* *
......
...@@ -105,16 +105,9 @@ int KeybRemoveKey(struct vnt_private *, PSKeyManagement pTable, ...@@ -105,16 +105,9 @@ int KeybRemoveKey(struct vnt_private *, PSKeyManagement pTable,
int KeybRemoveAllKey(struct vnt_private *, PSKeyManagement pTable, int KeybRemoveAllKey(struct vnt_private *, PSKeyManagement pTable,
u8 *pbyBSSID); u8 *pbyBSSID);
void KeyvRemoveWEPKey(struct vnt_private *, PSKeyManagement pTable,
u32 dwKeyIndex);
void KeyvRemoveAllWEPKey(struct vnt_private *, PSKeyManagement pTable);
int KeybGetTransmitKey(PSKeyManagement pTable, u8 *pbyBSSID, u32 dwKeyType, int KeybGetTransmitKey(PSKeyManagement pTable, u8 *pbyBSSID, u32 dwKeyType,
PSKeyItem *pKey); PSKeyItem *pKey);
int KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey);
int KeybSetDefaultKey(struct vnt_private *, PSKeyManagement pTable, int KeybSetDefaultKey(struct vnt_private *, PSKeyManagement pTable,
u32 dwKeyIndex, u32 uKeyLength, u64 *KeyRSC, u8 *pbyKey, u32 dwKeyIndex, u32 uKeyLength, u64 *KeyRSC, u8 *pbyKey,
u8 byKeyDecMode); u8 byKeyDecMode);
......
...@@ -45,51 +45,6 @@ static int msglevel =MSG_LEVEL_INFO; ...@@ -45,51 +45,6 @@ static int msglevel =MSG_LEVEL_INFO;
/*
* 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,
(u16) (MAC_REG_MAR0 + uByteIdx),
MESSAGE_REQUEST_MACREG,
2,
pbyData);
}
/* /*
* Description: * Description:
* Write MAC Multicast Address Mask * Write MAC Multicast Address Mask
...@@ -157,26 +112,6 @@ void MACvSetBBType(struct vnt_private *pDevice, u8 byType) ...@@ -157,26 +112,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] = (u8)dwData;
pbyData[1] = (u8)(dwData>>8);
pbyData[2] = (u8)(dwData>>16);
pbyData[3] = (u8)(dwData>>24);
CONTROLnsRequestOut(pDevice,
MESSAGE_TYPE_WRITE_MISCFF,
wOffset,
0,
4,
pbyData
);
}
/* /*
* Description: * Description:
* Disable the Key Entry by MISCFIFO * Disable the Key Entry by MISCFIFO
......
...@@ -413,11 +413,9 @@ ...@@ -413,11 +413,9 @@
void MACvSetMultiAddrByHash(struct vnt_private *, u8);
void MACvWriteMultiAddr(struct vnt_private *, u32, u8); void MACvWriteMultiAddr(struct vnt_private *, u32, u8);
void MACbShutdown(struct vnt_private *); void MACbShutdown(struct vnt_private *);
void MACvSetBBType(struct vnt_private *, u8); void MACvSetBBType(struct vnt_private *, u8);
void MACvSetMISCFifo(struct vnt_private *pDevice, u16, u32);
void MACvDisableKeyEntry(struct vnt_private *, u32); void MACvDisableKeyEntry(struct vnt_private *, u32);
void MACvSetKeyEntry(struct vnt_private *, u16, u32, u32, u8 *, u32 *); void MACvSetKeyEntry(struct vnt_private *, u16, u32, u32, u8 *, u32 *);
void MACvRegBitsOff(struct vnt_private *, u8, u8); void MACvRegBitsOff(struct vnt_private *, u8, u8);
......
...@@ -25,10 +25,8 @@ ...@@ -25,10 +25,8 @@
* Date: May 21, 1996 * Date: May 21, 1996
* *
* Functions: * Functions:
* STAvClearAllCounter - Clear All MIB Counter
* STAvUpdateIstStatCounter - Update ISR statistic counter * STAvUpdateIstStatCounter - Update ISR statistic counter
* STAvUpdateRDStatCounter - Update Rx statistic counter * STAvUpdateRDStatCounter - Update Rx statistic counter
* STAvUpdateRDStatCounterEx - Update Rx statistic counter and copy rcv data
* STAvUpdateTDStatCounter - Update Tx statistic counter * STAvUpdateTDStatCounter - Update Tx statistic counter
* STAvUpdateTDStatCounterEx - Update Tx statistic counter and copy tx data * STAvUpdateTDStatCounterEx - Update Tx statistic counter and copy tx data
* STAvUpdate802_11Counter - Update 802.11 mib counter * STAvUpdate802_11Counter - Update 802.11 mib counter
...@@ -49,27 +47,6 @@ static int msglevel =MSG_LEVEL_INFO; ...@@ -49,27 +47,6 @@ static int msglevel =MSG_LEVEL_INFO;
/*
* Description: Clear All Statistic Counter
*
* Parameters:
* In:
* pStatistic - Pointer to Statistic Counter Data Structure
* Out:
* none
*
* Return Value: none
*
*/
void STAvClearAllCounter (PSStatCounter pStatistic)
{
// set memory to zero
memset(pStatistic, 0, sizeof(SStatCounter));
}
/* /*
* Description: Update Isr Statistic Counter * Description: Update Isr Statistic Counter
* *
...@@ -364,51 +341,6 @@ void STAvUpdateRDStatCounter(PSStatCounter pStatistic, ...@@ -364,51 +341,6 @@ void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
} }
} }
/*
* Description: Update Rx Statistic Counter and copy Rx buffer
*
* Parameters:
* In:
* pStatistic - Pointer to Statistic Counter Data Structure
* byRSR - Rx Status
* byNewRSR - Rx Status
* pbyBuffer - Rx Buffer
* cbFrameLength - Rx Length
* Out:
* none
*
* Return Value: none
*
*/
void
STAvUpdateRDStatCounterEx (
PSStatCounter pStatistic,
u8 byRSR,
u8 byNewRSR,
u8 byRxSts,
u8 byRxRate,
u8 * pbyBuffer,
unsigned int cbFrameLength
)
{
STAvUpdateRDStatCounter(
pStatistic,
byRSR,
byNewRSR,
byRxSts,
byRxRate,
pbyBuffer,
cbFrameLength
);
// rx length
pStatistic->dwCntRxFrmLength = cbFrameLength;
// rx pattern, we just see 10 bytes for sample
memcpy(pStatistic->abyCntRxPattern, (u8 *)pbyBuffer, 10);
}
/* /*
* Description: Update Tx Statistic Counter * Description: Update Tx Statistic Counter
* *
...@@ -543,25 +475,6 @@ STAvUpdate802_11Counter( ...@@ -543,25 +475,6 @@ STAvUpdate802_11Counter(
pStatistic->dwRsrMulticast); pStatistic->dwRsrMulticast);
} }
/*
* Description: Clear 802.11 mib counter
*
* Parameters:
* In:
* p802_11Counter - Pointer to 802.11 mib counter
* Out:
* none
*
* Return Value: none
*
*/
void
STAvClear802_11Counter(PSDot11Counters p802_11Counter)
{
// set memory to zero
memset(p802_11Counter, 0, sizeof(SDot11Counters));
}
/* /*
* Description: Clear 802.11 mib counter * Description: Clear 802.11 mib counter
* *
......
...@@ -368,8 +368,6 @@ typedef struct tagSStatCounter { ...@@ -368,8 +368,6 @@ typedef struct tagSStatCounter {
void STAvClearAllCounter(PSStatCounter pStatistic);
void STAvUpdateIsrStatCounter(PSStatCounter pStatistic, void STAvUpdateIsrStatCounter(PSStatCounter pStatistic,
u8 byIsr0, u8 byIsr0,
u8 byIsr1); u8 byIsr1);
...@@ -379,11 +377,6 @@ void STAvUpdateRDStatCounter(PSStatCounter pStatistic, ...@@ -379,11 +377,6 @@ void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
u8 byRxRate, u8 * pbyBuffer, u8 byRxRate, u8 * pbyBuffer,
unsigned int cbFrameLength); unsigned int cbFrameLength);
void STAvUpdateRDStatCounterEx(PSStatCounter pStatistic,
u8 byRSR, u8 byNewRSR, u8 byRxSts,
u8 byRxRate, u8 * pbyBuffer,
unsigned int cbFrameLength);
void STAvUpdateTDStatCounter(PSStatCounter pStatistic, u8 byPktNum, void STAvUpdateTDStatCounter(PSStatCounter pStatistic, u8 byPktNum,
u8 byRate, u8 byTSR); u8 byRate, u8 byTSR);
...@@ -397,7 +390,6 @@ STAvUpdate802_11Counter( ...@@ -397,7 +390,6 @@ STAvUpdate802_11Counter(
u8 byFCSErr u8 byFCSErr
); );
void STAvClear802_11Counter(PSDot11Counters p802_11Counter);
void STAvUpdateUSBCounter(PSUSBCounter pUsbCounter, int ntStatus); void STAvUpdateUSBCounter(PSUSBCounter pUsbCounter, int ntStatus);
#endif /* __MIB_H__ */ #endif /* __MIB_H__ */
...@@ -1115,20 +1115,3 @@ void RFbRFTableDownload(struct vnt_private *pDevice) ...@@ -1115,20 +1115,3 @@ void RFbRFTableDownload(struct vnt_private *pDevice)
} }
} }
int s_bVT3226D0_11bLoCurrentAdjust(struct vnt_private *pDevice, u8 byChannel,
int b11bMode)
{
int bResult = true;
if (b11bMode)
bResult &= IFRFbWriteEmbedded(pDevice,
dwVT3226D0LoCurrentTable[byChannel-1]);
else
bResult &= IFRFbWriteEmbedded(pDevice, 0x016bc600 +
(BY_VT3226_REG_LEN << 3) + IFREGCTL_REGW);
return bResult;
}
...@@ -63,7 +63,5 @@ int RFbSetPower(struct vnt_private *, u32 uRATE, u32 uCH); ...@@ -63,7 +63,5 @@ int RFbSetPower(struct vnt_private *, u32 uRATE, u32 uCH);
int RFbRawSetPower(struct vnt_private *, u8 byPwr, u32 uRATE); int RFbRawSetPower(struct vnt_private *, u8 byPwr, u32 uRATE);
void RFvRSSITodBm(struct vnt_private *, u8 byCurrRSSI, long *pldBm); void RFvRSSITodBm(struct vnt_private *, u8 byCurrRSSI, long *pldBm);
void RFbRFTableDownload(struct vnt_private *pDevice); void RFbRFTableDownload(struct vnt_private *pDevice);
int s_bVT3226D0_11bLoCurrentAdjust(struct vnt_private *, u8 byChannel,
int b11bMode);
#endif /* __RF_H__ */ #endif /* __RF_H__ */
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
* Date: May 21, 1996 * Date: May 21, 1996
* *
* Functions: * Functions:
* ETHbyGetHashIndexByCrc32 - Calculate multicast hash value by CRC32
* ETHbIsBufferCrc32Ok - Check CRC value of the buffer if Ok or not * ETHbIsBufferCrc32Ok - Check CRC value of the buffer if Ok or not
* *
* Revision History: * Revision History:
...@@ -42,42 +41,6 @@ ...@@ -42,42 +41,6 @@
/*
* Description: Calculate multicast hash value by CRC32
*
* Parameters:
* In:
* pbyMultiAddr - Multicast Address
* Out:
* none
*
* Return Value: Hash value
*
*/
u8 ETHbyGetHashIndexByCrc32(u8 * pbyMultiAddr)
{
int ii;
u8 byTmpHash;
u8 byHash = 0;
/* get the least 6-bits from CRC generator */
byTmpHash = (u8)(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 * Description: Check CRC value of the buffer if Ok or not
* *
......
...@@ -117,7 +117,6 @@ S802_3Header, *PS802_3Header; ...@@ -117,7 +117,6 @@ S802_3Header, *PS802_3Header;
u8 ETHbyGetHashIndexByCrc32(u8 * pbyMultiAddr);
//u8 ETHbyGetHashIndexByCrc(u8 * pbyMultiAddr); //u8 ETHbyGetHashIndexByCrc(u8 * pbyMultiAddr);
bool ETHbIsBufferCrc32Ok(u8 * pbyBuffer, unsigned int cbFrameLength); bool ETHbIsBufferCrc32Ok(u8 * pbyBuffer, unsigned int cbFrameLength);
......
...@@ -238,121 +238,3 @@ WPA2vParseRSN ( ...@@ -238,121 +238,3 @@ WPA2vParseRSN (
pBSSNode->bWPA2Valid = true; pBSSNode->bWPA2Valid = true;
} }
} }
/*+
*
* Description:
* Set WPA IEs
*
* Parameters:
* In:
* pMgmtHandle - Pointer to management object
* Out:
* pRSNIEs - Pointer to the RSN IE to set.
*
* Return Value: length of IEs.
*
-*/
unsigned int WPA2uSetIEs(void *pMgmtHandle, PWLAN_IE_RSN pRSNIEs)
{
struct vnt_manager *pMgmt = (struct vnt_manager *)pMgmtHandle;
u8 *pbyBuffer = NULL;
int ii = 0;
u16 *pwPMKID = NULL;
if (pRSNIEs == NULL)
return 0;
if (((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) ||
(pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) &&
(pMgmt->pCurrBSS != NULL)) {
/* WPA2 IE */
pbyBuffer = (u8 *) pRSNIEs;
pRSNIEs->byElementID = WLAN_EID_RSN;
pRSNIEs->len = 6; //Version(2)+GK(4)
pRSNIEs->wVersion = 1;
//Group Key Cipher Suite
pRSNIEs->abyRSN[0] = 0x00;
pRSNIEs->abyRSN[1] = 0x0F;
pRSNIEs->abyRSN[2] = 0xAC;
if (pMgmt->byCSSGK == KEY_CTL_WEP) {
pRSNIEs->abyRSN[3] = pMgmt->pCurrBSS->byCSSGK;
} else if (pMgmt->byCSSGK == KEY_CTL_TKIP) {
pRSNIEs->abyRSN[3] = WLAN_11i_CSS_TKIP;
} else if (pMgmt->byCSSGK == KEY_CTL_CCMP) {
pRSNIEs->abyRSN[3] = WLAN_11i_CSS_CCMP;
} else {
pRSNIEs->abyRSN[3] = WLAN_11i_CSS_UNKNOWN;
}
// Pairwise Key Cipher Suite
pRSNIEs->abyRSN[4] = 1;
pRSNIEs->abyRSN[5] = 0;
pRSNIEs->abyRSN[6] = 0x00;
pRSNIEs->abyRSN[7] = 0x0F;
pRSNIEs->abyRSN[8] = 0xAC;
if (pMgmt->byCSSPK == KEY_CTL_TKIP) {
pRSNIEs->abyRSN[9] = WLAN_11i_CSS_TKIP;
} else if (pMgmt->byCSSPK == KEY_CTL_CCMP) {
pRSNIEs->abyRSN[9] = WLAN_11i_CSS_CCMP;
} else if (pMgmt->byCSSPK == KEY_CTL_NONE) {
pRSNIEs->abyRSN[9] = WLAN_11i_CSS_USE_GROUP;
} else {
pRSNIEs->abyRSN[9] = WLAN_11i_CSS_UNKNOWN;
}
pRSNIEs->len += 6;
// Auth Key Management Suite
pRSNIEs->abyRSN[10] = 1;
pRSNIEs->abyRSN[11] = 0;
pRSNIEs->abyRSN[12] = 0x00;
pRSNIEs->abyRSN[13] = 0x0F;
pRSNIEs->abyRSN[14] = 0xAC;
if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK) {
pRSNIEs->abyRSN[15] = WLAN_11i_AKMSS_PSK;
} else if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) {
pRSNIEs->abyRSN[15] = WLAN_11i_AKMSS_802_1X;
} else {
pRSNIEs->abyRSN[15] = WLAN_11i_AKMSS_UNKNOWN;
}
pRSNIEs->len +=6;
// RSN Capabilites
if (pMgmt->pCurrBSS->sRSNCapObj.bRSNCapExist == true) {
memcpy(&pRSNIEs->abyRSN[16], &pMgmt->pCurrBSS->sRSNCapObj.wRSNCap, 2);
} else {
pRSNIEs->abyRSN[16] = 0;
pRSNIEs->abyRSN[17] = 0;
}
pRSNIEs->len +=2;
if ((pMgmt->gsPMKIDCache.BSSIDInfoCount > 0) &&
(pMgmt->bRoaming == true) &&
(pMgmt->eAuthenMode == WMAC_AUTH_WPA2)) {
/* RSN PMKID, pointer to PMKID count */
pwPMKID = (u16 *)(&pRSNIEs->abyRSN[18]);
*pwPMKID = 0; /* Initialize PMKID count */
pbyBuffer = &pRSNIEs->abyRSN[20]; /* Point to PMKID list */
for (ii = 0; ii < pMgmt->gsPMKIDCache.BSSIDInfoCount; ii++) {
if (!memcmp(&pMgmt->
gsPMKIDCache.BSSIDInfo[ii].abyBSSID[0],
pMgmt->abyCurrBSSID,
ETH_ALEN)) {
(*pwPMKID)++;
memcpy(pbyBuffer,
pMgmt->gsPMKIDCache.BSSIDInfo[ii].abyPMKID,
16);
pbyBuffer += 16;
}
}
if (*pwPMKID != 0) {
pRSNIEs->len += (2 + (*pwPMKID)*16);
} else {
pbyBuffer = &pRSNIEs->abyRSN[18];
}
}
return(pRSNIEs->len + WLAN_IEHDR_LEN);
}
return(0);
}
...@@ -55,6 +55,4 @@ typedef struct tagSPMKIDCache { ...@@ -55,6 +55,4 @@ typedef struct tagSPMKIDCache {
void WPA2_ClearRSN(PKnownBSS pBSSNode); void WPA2_ClearRSN(PKnownBSS pBSSNode);
void WPA2vParseRSN(PKnownBSS pBSSNode, PWLAN_IE_RSN pRSN); void WPA2vParseRSN(PKnownBSS pBSSNode, PWLAN_IE_RSN pRSN);
unsigned int WPA2uSetIEs(void *pMgmtHandle, PWLAN_IE_RSN pRSNIEs);
#endif /* __WPA2_H__ */ #endif /* __WPA2_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment