Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d56131de authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: change bssdb/rxtx/wpa2 to new structures 



Use
struct vnt_private
struct vnt_manager

Move vnt_manager from sMgmtObj to vnt_mgmt.

This patch cleans up function declarations, definitions and local variables
where appropriate replacing types defined in "type.h" with linux/types.h.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 532572b9

drivers/staging/vt6656/bssdb.c

+135 −158
Original line number Diff line number Diff line
@@ -91,9 +91,9 @@ const WORD awHWRetry1[5][5] = { 


/*---------------------  Static Functions  --------------------------*/



void s_vCheckSensitivity(void *hDeviceContext);

void s_vCheckPreEDThreshold(void *hDeviceContext);

void s_uCalculateLinkQual(void *hDeviceContext);

static void s_vCheckSensitivity(struct vnt_private *pDevice);

static void s_vCheckPreEDThreshold(struct vnt_private *pDevice);

static void s_uCalculateLinkQual(struct vnt_private *pDevice);



/*---------------------  Export Variables  --------------------------*/
@@ -114,20 +114,19 @@ void s_uCalculateLinkQual(void *hDeviceContext); 
 *

-*/



PKnownBSS BSSpSearchBSSList(void *hDeviceContext,

			    PBYTE pbyDesireBSSID,

			    PBYTE pbyDesireSSID,

PKnownBSS BSSpSearchBSSList(struct vnt_private *pDevice,

		u8 *pbyDesireBSSID, u8 *pbyDesireSSID,

		CARD_PHY_TYPE ePhyType)

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PBYTE           pbyBSSID = NULL;

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	u8 *pbyBSSID = NULL;

	PWLAN_IE_SSID pSSID = NULL;

	PKnownBSS pCurrBSS = NULL;

	PKnownBSS pSelect = NULL;

    BYTE                 ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00};

    unsigned int ii = 0;

    unsigned int jj = 0;

	u8 ZeroBSSID[WLAN_BSSID_LEN] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

	int ii = 0;

	int jj = 0;



    if (pbyDesireBSSID != NULL) {

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO

			"BSSpSearchBSSList BSSID[%pM]\n", pbyDesireBSSID);
@@ -262,11 +261,10 @@ pDevice->bSameBSSMaxNum = jj; 
-*/





void BSSvClearBSSList(void *hDeviceContext, BOOL bKeepCurrBSSID)

void BSSvClearBSSList(struct vnt_private *pDevice, int bKeepCurrBSSID)

{

    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    unsigned int            ii;

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	int ii;



    for (ii = 0; ii < MAX_BSS_NUM; ii++) {

        if (bKeepCurrBSSID) {
@@ -298,14 +296,12 @@ void BSSvClearBSSList(void *hDeviceContext, BOOL bKeepCurrBSSID) 
 *    TRUE if found.

 *

-*/

PKnownBSS BSSpAddrIsInBSSList(void *hDeviceContext,

			      PBYTE abyBSSID,

			      PWLAN_IE_SSID pSSID)

PKnownBSS BSSpAddrIsInBSSList(struct vnt_private *pDevice,

	u8 *abyBSSID, PWLAN_IE_SSID pSSID)

{

    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	PKnownBSS pBSSList = NULL;

    unsigned int            ii;

	int ii;



    for (ii = 0; ii < MAX_BSS_NUM; ii++) {

        pBSSList = &(pMgmt->sBSSList[ii]);
@@ -336,12 +332,12 @@ PKnownBSS BSSpAddrIsInBSSList(void *hDeviceContext, 
 *

-*/



BOOL BSSbInsertToBSSList(void *hDeviceContext,

			 PBYTE abyBSSIDAddr,

int BSSbInsertToBSSList(struct vnt_private *pDevice,

			u8 *abyBSSIDAddr,

			u64 qwTimestamp,

			 WORD wBeaconInterval,

			 WORD wCapInfo,

			 BYTE byCurrChannel,

			u16 wBeaconInterval,

			u16 wCapInfo,

			u8 byCurrChannel,

			PWLAN_IE_SSID pSSID,

			PWLAN_IE_SUPP_RATES pSuppRates,

			PWLAN_IE_SUPP_RATES pExtSuppRates,
@@ -350,20 +346,18 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, 
			PWLAN_IE_RSN_EXT pRSNWPA,

			PWLAN_IE_COUNTRY pIE_Country,

			PWLAN_IE_QUIET pIE_Quiet,

			 unsigned int uIELength,

			 PBYTE pbyIEs,

			u32 uIELength,

			u8 *pbyIEs,

			void *pRxPacketContext)

{



    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PSRxMgmtPacket  pRxPacket = (PSRxMgmtPacket)pRxPacketContext;

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct vnt_rx_mgmt *pRxPacket =

		(struct vnt_rx_mgmt *)pRxPacketContext;

	PKnownBSS pBSSList = NULL;

	unsigned int ii;

	BOOL bParsingQuiet = FALSE;







    pBSSList = (PKnownBSS)&(pMgmt->sBSSList[0]);



    for (ii = 0; ii < MAX_BSS_NUM; ii++) {
@@ -516,12 +510,12 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, 
-*/

// TODO: input structure modify



BOOL BSSbUpdateToBSSList(void *hDeviceContext,

int BSSbUpdateToBSSList(struct vnt_private *pDevice,

			u64 qwTimestamp,

			 WORD wBeaconInterval,

			 WORD wCapInfo,

			 BYTE byCurrChannel,

			 BOOL bChannelHit,

			u16 wBeaconInterval,

			u16 wCapInfo,

			u8 byCurrChannel,

			int bChannelHit,

			PWLAN_IE_SSID pSSID,

			PWLAN_IE_SUPP_RATES pSuppRates,

			PWLAN_IE_SUPP_RATES pExtSuppRates,
@@ -531,14 +525,14 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, 
			PWLAN_IE_COUNTRY pIE_Country,

			PWLAN_IE_QUIET pIE_Quiet,

			PKnownBSS pBSSList,

			 unsigned int uIELength,

			 PBYTE pbyIEs,

			u32 uIELength,

			u8 *pbyIEs,

			void *pRxPacketContext)

{

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct vnt_rx_mgmt *pRxPacket =

		(struct vnt_rx_mgmt *)pRxPacketContext;

	int ii, jj;

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PSRxMgmtPacket  pRxPacket = (PSRxMgmtPacket)pRxPacketContext;

	signed long ldBm, ldBmSum;

	BOOL bParsingQuiet = FALSE;
@@ -658,12 +652,10 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, 
 *

-*/



BOOL BSSbIsSTAInNodeDB(void *hDeviceContext,

		       PBYTE abyDstAddr,

		       unsigned int *puNodeIndex)

int BSSbIsSTAInNodeDB(struct vnt_private *pDevice,

		u8 *abyDstAddr, u32 *puNodeIndex)

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	unsigned int ii;



    // Index = 0 reserved for AP Node
@@ -692,15 +684,14 @@ BOOL BSSbIsSTAInNodeDB(void *hDeviceContext, 
 *    None

 *

-*/

void BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex)

void BSSvCreateOneNode(struct vnt_private *pDevice, u32 *puNodeIndex)

{



    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    unsigned int            ii;

    unsigned int            BigestCount = 0;

    unsigned int            SelectIndex;

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	int            ii;

	u32 BigestCount = 0;

	u32 SelectIndex;

	struct sk_buff  *skb;



    // Index = 0 reserved for AP Node (In STA mode)

    // Index = 0 reserved for Broadcast/MultiCast (In AP mode)

    SelectIndex = 1;
@@ -753,12 +744,10 @@ void BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex) 
 *

-*/



void BSSvRemoveOneNode(void *hDeviceContext, unsigned int uNodeIndex)

void BSSvRemoveOneNode(struct vnt_private *pDevice, u32 uNodeIndex)

{



    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    BYTE            byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	u8 byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};

	struct sk_buff  *skb;
@@ -780,14 +769,11 @@ void BSSvRemoveOneNode(void *hDeviceContext, unsigned int uNodeIndex) 
 *

-*/



void BSSvUpdateAPNode(void *hDeviceContext,

		      PWORD pwCapInfo,

		      PWLAN_IE_SUPP_RATES pSuppRates,

		      PWLAN_IE_SUPP_RATES pExtSuppRates)

void BSSvUpdateAPNode(struct vnt_private *pDevice, u16 *pwCapInfo,

	PWLAN_IE_SUPP_RATES pSuppRates, PWLAN_IE_SUPP_RATES pExtSuppRates)

{

    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    unsigned int            uRateLen = WLAN_RATES_MAXLEN;

	struct vnt_manager *pMgmt = &(pDevice->sMgmtObj);

	u32 uRateLen = WLAN_RATES_MAXLEN;



    memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB));
@@ -832,10 +818,9 @@ void BSSvUpdateAPNode(void *hDeviceContext, 
 *

-*/



void BSSvAddMulticastNode(void *hDeviceContext)

void BSSvAddMulticastNode(struct vnt_private *pDevice)

{

    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;



    if (!pDevice->bEnableHostWEP)

        memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB));
@@ -871,15 +856,14 @@ void BSSvAddMulticastNode(void *hDeviceContext) 
 *

-*/



void BSSvSecondCallBack(void *hDeviceContext)

void BSSvSecondCallBack(struct vnt_private *pDevice)

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    unsigned int            ii;

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	int ii;

	PWLAN_IE_SSID pItemSSID, pCurrSSID;

    unsigned int            uSleepySTACnt = 0;

    unsigned int            uNonShortSlotSTACnt = 0;

    unsigned int            uLongPreambleSTACnt = 0;

	u32 uSleepySTACnt = 0;

	u32 uNonShortSlotSTACnt = 0;

	u32 uLongPreambleSTACnt = 0;



    spin_lock_irq(&pDevice->lock);
@@ -925,7 +909,7 @@ if(pDevice->byReAssocCount > 0) { 


 pMgmt->eLastState = pMgmt->eCurrState ;



   s_uCalculateLinkQual((void *)pDevice);

	s_uCalculateLinkQual(pDevice);



    for (ii = 0; ii < (MAX_NODE_NUM + 1); ii++) {
@@ -1065,8 +1049,8 @@ if(pDevice->byReAssocCount > 0) { 
        if (pMgmt->sNodeDBTable[0].bActive) { // Assoc with BSS



            if (pDevice->bUpdateBBVGA) {

		/* s_vCheckSensitivity((void *) pDevice); */

		s_vCheckPreEDThreshold((void *) pDevice);

		s_vCheckSensitivity(pDevice);

		s_vCheckPreEDThreshold(pDevice);

            }



    	    if ((pMgmt->sNodeDBTable[0].uInActiveCount >= (LOST_BEACON_COUNT/2)) &&
@@ -1167,8 +1151,8 @@ else { 
        if (pMgmt->eCurrState == WMAC_STATE_JOINTED) {



		if (pDevice->bUpdateBBVGA) {

			/* s_vCheckSensitivity((void *) pDevice); */

			s_vCheckPreEDThreshold((void *) pDevice);

			s_vCheckSensitivity(pDevice);

			s_vCheckPreEDThreshold(pDevice);

		}

        	if (pMgmt->sNodeDBTable[0].uInActiveCount >=ADHOC_LOST_BEACON_COUNT) {

        	    DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost other STA beacon [%d] sec, started !\n", pMgmt->sNodeDBTable[0].uInActiveCount);
@@ -1205,22 +1189,19 @@ else { 
 *

-*/



void BSSvUpdateNodeTxCounter(void *hDeviceContext,

			     PSStatCounter pStatistic,

			     BYTE byTSR,

			     BYTE byPktNO)

void BSSvUpdateNodeTxCounter(struct vnt_private *pDevice,

	PSStatCounter pStatistic, u8 byTSR, u8 byPktNO)

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    unsigned int            uNodeIndex = 0;

    BYTE            byTxRetry;

    WORD            wRate;

    WORD            wFallBackRate = RATE_1M;

    BYTE            byFallBack;

    unsigned int            ii;

    PBYTE           pbyDestAddr;

    BYTE            byPktNum;

    WORD            wFIFOCtl;

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	u32 uNodeIndex = 0;

	u8 byTxRetry;

	u16 wRate;

	u16 wFallBackRate = RATE_1M;

	u8 byFallBack;

	int ii;

	u8 *pbyDestAddr;

	u8 byPktNum;

	u16 wFIFOCtl;



    byPktNum = (byPktNO & 0x0F) >> 4;

    byTxRetry = (byTSR & 0xF0) >> 4;
@@ -1368,13 +1349,11 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext, 
 *

-*/



void BSSvClearNodeDBTable(void *hDeviceContext,

			  unsigned int uStartIndex)

void BSSvClearNodeDBTable(struct vnt_private *pDevice, u32 uStartIndex)

{

    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct sk_buff  *skb;

    unsigned int            ii;

	int ii;



    for (ii = uStartIndex; ii < (MAX_NODE_NUM + 1); ii++) {

        if (pMgmt->sNodeDBTable[ii].bActive) {
@@ -1390,11 +1369,10 @@ void BSSvClearNodeDBTable(void *hDeviceContext, 
    }

};



void s_vCheckSensitivity(void *hDeviceContext)

static void s_vCheckSensitivity(struct vnt_private *pDevice)

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;

	PKnownBSS pBSSList = NULL;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	int ii;



    if ((pMgmt->eCurrState == WMAC_STATE_ASSOC) ||
@@ -1422,7 +1400,7 @@ void s_vCheckSensitivity(void *hDeviceContext) 
                if (pDevice->byBBVGANew != pDevice->byBBVGACurrent) {

                    pDevice->uBBVGADiffCount++;

                    if (pDevice->uBBVGADiffCount >= BB_VGA_CHANGE_THRESHOLD)

			bScheduleCommand((void *) pDevice,

			bScheduleCommand(pDevice,

					 WLAN_CMD_CHANGE_BBSENSITIVITY,

					 NULL);

                } else {
@@ -1433,9 +1411,8 @@ void s_vCheckSensitivity(void *hDeviceContext) 
    }

}



void s_uCalculateLinkQual(void *hDeviceContext)

static void s_uCalculateLinkQual(struct vnt_private *pDevice)

{

   PSDevice        pDevice = (PSDevice)hDeviceContext;

	unsigned long TxOkRatio, TxCnt;

	unsigned long RxOkRatio, RxCnt;

	unsigned long RssiRatio;
@@ -1476,21 +1453,21 @@ else 
   pDevice->scStatistic.TxRetryOkCount = 0;

}



void BSSvClearAnyBSSJoinRecord(void *hDeviceContext)

void BSSvClearAnyBSSJoinRecord(struct vnt_private *pDevice)

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    unsigned int            ii;

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	int ii;



	for (ii = 0; ii < MAX_BSS_NUM; ii++)

		pMgmt->sBSSList[ii].bSelected = FALSE;



	return;

}



void s_vCheckPreEDThreshold(void *hDeviceContext)

static void s_vCheckPreEDThreshold(struct vnt_private *pDevice)

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;

	PKnownBSS pBSSList = NULL;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;



    if ((pMgmt->eCurrState == WMAC_STATE_ASSOC) ||

        ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED))) {

drivers/staging/vt6656/bssdb.h

+60 −70
Original line number Diff line number Diff line
@@ -226,23 +226,20 @@ typedef struct tagKnownNodeDB { 


/*---------------------  Export Functions  --------------------------*/



PKnownBSS BSSpSearchBSSList(void *hDeviceContext,

			    PBYTE pbyDesireBSSID,

			    PBYTE pbyDesireSSID,

			    CARD_PHY_TYPE ePhyType);

PKnownBSS BSSpSearchBSSList(struct vnt_private *, u8 *pbyDesireBSSID,

	u8 *pbyDesireSSID, CARD_PHY_TYPE ePhyType);



PKnownBSS BSSpAddrIsInBSSList(void *hDeviceContext,

			      PBYTE abyBSSID,

PKnownBSS BSSpAddrIsInBSSList(struct vnt_private *, u8 *abyBSSID,

	PWLAN_IE_SSID pSSID);



void BSSvClearBSSList(void *hDeviceContext, BOOL bKeepCurrBSSID);

void BSSvClearBSSList(struct vnt_private *, int bKeepCurrBSSID);



BOOL BSSbInsertToBSSList(void *hDeviceContext,

			 PBYTE abyBSSIDAddr,

int BSSbInsertToBSSList(struct vnt_private *,

			u8 *abyBSSIDAddr,

			u64 qwTimestamp,

			 WORD wBeaconInterval,

			 WORD wCapInfo,

			 BYTE byCurrChannel,

			u16 wBeaconInterval,

			u16 wCapInfo,

			u8 byCurrChannel,

			PWLAN_IE_SSID pSSID,

			PWLAN_IE_SUPP_RATES pSuppRates,

			PWLAN_IE_SUPP_RATES pExtSuppRates,
@@ -251,16 +248,16 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, 
			PWLAN_IE_RSN_EXT pRSNWPA,

			PWLAN_IE_COUNTRY pIE_Country,

			PWLAN_IE_QUIET pIE_Quiet,

			 unsigned int uIELength,

			 PBYTE pbyIEs,

			u32 uIELength,

			u8 *pbyIEs,

			void *pRxPacketContext);



BOOL BSSbUpdateToBSSList(void *hDeviceContext,

int BSSbUpdateToBSSList(struct vnt_private *,

			u64 qwTimestamp,

			 WORD wBeaconInterval,

			 WORD wCapInfo,

			 BYTE byCurrChannel,

			 BOOL bChannelHit,

			u16 wBeaconInterval,

			u16 wCapInfo,

			u8 byCurrChannel,

			int bChannelHit,

			PWLAN_IE_SSID pSSID,

			PWLAN_IE_SUPP_RATES pSuppRates,

			PWLAN_IE_SUPP_RATES pExtSuppRates,
@@ -270,36 +267,29 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, 
			PWLAN_IE_COUNTRY pIE_Country,

			PWLAN_IE_QUIET pIE_Quiet,

			PKnownBSS pBSSList,

			 unsigned int uIELength,

			 PBYTE pbyIEs,

			u32 uIELength,

			u8 *pbyIEs,

			void *pRxPacketContext);



BOOL BSSbIsSTAInNodeDB(void *hDeviceContext,

		       PBYTE abyDstAddr,

		       unsigned int *puNodeIndex);

int BSSbIsSTAInNodeDB(struct vnt_private *, PBYTE abyDstAddr,

	u32 *puNodeIndex);



void BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex);

void BSSvCreateOneNode(struct vnt_private *, u32 *puNodeIndex);



void BSSvUpdateAPNode(void *hDeviceContext,

		      PWORD pwCapInfo,

		      PWLAN_IE_SUPP_RATES pItemRates,

		      PWLAN_IE_SUPP_RATES pExtSuppRates);

void BSSvUpdateAPNode(struct vnt_private *, u16 *pwCapInfo,

	PWLAN_IE_SUPP_RATES pItemRates, PWLAN_IE_SUPP_RATES pExtSuppRates);



void BSSvSecondCallBack(void *hDeviceContext);

void BSSvSecondCallBack(struct vnt_private *);



void BSSvUpdateNodeTxCounter(void *hDeviceContext,

			     PSStatCounter pStatistic,

			     BYTE byTSR,

			     BYTE byPktNO);

void BSSvUpdateNodeTxCounter(struct vnt_private *, PSStatCounter pStatistic,

	u8 byTSR, u8 byPktNO);



void BSSvRemoveOneNode(void *hDeviceContext,

		       unsigned int uNodeIndex);

void BSSvRemoveOneNode(struct vnt_private *, u32 uNodeIndex);



void BSSvAddMulticastNode(void *hDeviceContext);

void BSSvAddMulticastNode(struct vnt_private *);



void BSSvClearNodeDBTable(void *hDeviceContext,

			  unsigned int uStartIndex);

void BSSvClearNodeDBTable(struct vnt_private *, u32 uStartIndex);



void BSSvClearAnyBSSJoinRecord(void *hDeviceContext);

void BSSvClearAnyBSSJoinRecord(struct vnt_private *);



#endif /* __BSSDB_H__ */

drivers/staging/vt6656/rxtx.c

+243 −514

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/vt6656/rxtx.h

+6 −25
Original line number Diff line number Diff line
@@ -665,30 +665,11 @@ typedef struct tagSBEACON_BUFFER 


/*---------------------  Export Functions  --------------------------*/



BOOL

bPacketToWirelessUsb(

      PSDevice         pDevice,

      BYTE             byPktType,

      PBYTE            usbPacketBuf,

      BOOL             bNeedEncrypt,

      unsigned int             cbPayloadSize,

      unsigned int             uDMAIdx,

      PSEthernetHeader psEthHeader,

      PBYTE            pPacket,

      PSKeyItem        pTransmitKey,

      unsigned int             uNodeIndex,

      WORD             wCurrentRate,

     unsigned int             *pcbHeaderLen,

     unsigned int             *pcbTotalLen

    );



void vDMA0_tx_80211(PSDevice  pDevice, struct sk_buff *skb);

int nsDMA_tx_packet(PSDevice pDevice,

		    unsigned int uDMAIdx,

		    struct sk_buff *skb);

CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);

CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);

BOOL bRelayPacketSend(PSDevice pDevice, PBYTE pbySkbData,

		      unsigned int uDataLen, unsigned int uNodeIndex);

void vDMA0_tx_80211(struct vnt_private *, struct sk_buff *skb);

int nsDMA_tx_packet(struct vnt_private *, u32 uDMAIdx, struct sk_buff *skb);

CMD_STATUS csMgmt_xmit(struct vnt_private *, struct vnt_tx_mgmt *);

CMD_STATUS csBeacon_xmit(struct vnt_private *, struct vnt_tx_mgmt *);

int bRelayPacketSend(struct vnt_private *, u8 *pbySkbData, u32 uDataLen,

	u32 uNodeIndex);



#endif /* __RXTX_H__ */

drivers/staging/vt6656/wpa2.c

+8 −11
Original line number Diff line number Diff line
@@ -260,19 +260,16 @@ WPA2vParseRSN ( 
 * Return Value: length of IEs.

 *

-*/

unsigned int

WPA2uSetIEs(void *pMgmtHandle,

     PWLAN_IE_RSN pRSNIEs

    )

unsigned int WPA2uSetIEs(void *pMgmtHandle, PWLAN_IE_RSN pRSNIEs)

{

    PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtHandle;

    PBYTE           pbyBuffer = NULL;

    unsigned int            ii = 0;

    PWORD           pwPMKID = NULL;

	struct vnt_manager *pMgmt = (struct vnt_manager *)pMgmtHandle;

	u8 *pbyBuffer = NULL;

	int ii = 0;

	u16 *pwPMKID = NULL;



	if (pRSNIEs == NULL)

		return 0;



    if (pRSNIEs == NULL) {

        return(0);

    }

    if (((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) ||

         (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) &&

        (pMgmt->pCurrBSS != NULL)) {