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

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

staging: vt6656: staging: vt6656 change remaining to vnt_mgmt and remove typedef. 



Use
struct vnt_manager

Move vnt_manager from sMgmtObj to vnt_mgmt.

and remove typedef from structures
vnt_private
vnt_manager
vnt_rx_mgmt
vnt_tx_mgmt

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

drivers/staging/vt6656/bssdb.c

+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ void BSSvRemoveOneNode(struct vnt_private *pDevice, u32 uNodeIndex) 
void BSSvUpdateAPNode(struct vnt_private *pDevice, u16 *pwCapInfo,

	PWLAN_IE_SUPP_RATES pSuppRates, PWLAN_IE_SUPP_RATES pExtSuppRates)

{

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

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	u32 uRateLen = WLAN_RATES_MAXLEN;



    memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB));

drivers/staging/vt6656/card.c

+8 −8
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ void vUpdateIFS(struct vnt_private *pDevice) 
        }

        pDevice->uDIFS = C_SIFS_BG + 2*pDevice->uSlot;



        pItemRates = (PWLAN_IE_SUPP_RATES)pDevice->sMgmtObj.abyCurrSuppRates;

	pItemRates = (PWLAN_IE_SUPP_RATES)pDevice->vnt_mgmt.abyCurrSuppRates;

        for (ii = 0; ii < pItemRates->len; ii++) {

            byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F);

            if (RATEwGetRateIdx(byRate) > RATE_11M) {
@@ -522,7 +522,8 @@ void vUpdateIFS(struct vnt_private *pDevice) 
            }

        }

        if (bOFDMRate == FALSE) {

            pItemRates = (PWLAN_IE_SUPP_RATES)pDevice->sMgmtObj.abyCurrExtSuppRates;

		pItemRates = (PWLAN_IE_SUPP_RATES)pDevice->vnt_mgmt

			.abyCurrExtSuppRates;

            for (ii = 0; ii < pItemRates->len; ii++) {

                byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F);

                if (RATEwGetRateIdx(byRate) > RATE_11M) {
@@ -1036,9 +1037,8 @@ int CARDbChannelSwitch(struct vnt_private *pDevice, u8 byMode, 
	int bResult = TRUE;



	if (byCount == 0) {

        pDevice->sMgmtObj.uCurrChannel = byNewChannel;

		pDevice->vnt_mgmt.uCurrChannel = byNewChannel;

		CARDbSetMediaChannel(pDevice, byNewChannel);



		return bResult;

	}

    pDevice->byChannelSwitchCount = byCount;

drivers/staging/vt6656/device.h

+3 −4
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ typedef struct __device_opt { 
} OPTIONS, *POPTIONS;





typedef struct vnt_private {

struct vnt_private {



// netdev

	struct usb_device*          usb;
@@ -524,9 +524,8 @@ typedef struct vnt_private { 
    unsigned long                       RcvBuffersInUse;





    // 802.11 management

	/* 802.11 management */

	struct vnt_manager vnt_mgmt;

    SMgmtObject                 sMgmtObj;



	u64 qwCurrTSF;

    unsigned int                        cbBulkInMax;
@@ -815,7 +814,7 @@ typedef struct vnt_private { 
	struct iw_statistics	wstats;		// wireless stats

    BOOL                    bCommit;



} DEVICE_INFO, *PSDevice;

};

drivers/staging/vt6656/dpc.c

+5 −5
Original line number Diff line number Diff line
@@ -850,9 +850,9 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB, 
            RSC += wRxTSC15_0;

		memcpy(&(pKey->KeyRSC), &RSC,  sizeof(u64));



            if ( (pDevice->sMgmtObj.eCurrMode == WMAC_MODE_ESS_STA) &&

                 (pDevice->sMgmtObj.eCurrState == WMAC_STATE_ASSOC)) {

                // check RSC

		if (pDevice->vnt_mgmt.eCurrMode == WMAC_MODE_ESS_STA &&

			pDevice->vnt_mgmt.eCurrState == WMAC_STATE_ASSOC) {

			/* check RSC */

                if ( (wRxTSC15_0 < wLocalTSC15_0) &&

                     (dwRxTSC47_16 <= dwLocalTSC47_16) &&

                     !((dwRxTSC47_16 == 0) && (dwLocalTSC47_16 == 0xFFFFFFFF))) {
@@ -927,7 +927,7 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB, 
static int s_bAPModeRxCtl(struct vnt_private *pDevice, u8 *pbyFrame,

	s32 iSANodeIndex)

{

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

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	PS802_11Header p802_11Header;

	CMD_STATUS Status;
@@ -1456,7 +1456,7 @@ void RXvMngWorkItem(struct vnt_private *pDevice) 
        }

        ASSERT(pRCB);// cannot be NULL

        pRxPacket = &(pRCB->sMngPacket);

	vMgrRxManagePacket((void *) pDevice, &(pDevice->sMgmtObj), pRxPacket);

	vMgrRxManagePacket(pDevice, &pDevice->vnt_mgmt, pRxPacket);

        pRCB->Ref--;

        if(pRCB->Ref == 0) {

            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RxvFreeMng %d %d\n",pDevice->NumRecvFreeList, pDevice->NumRecvMngList);

drivers/staging/vt6656/mac.c

+3 −4
Original line number Diff line number Diff line
@@ -246,10 +246,9 @@ void MACvSetKeyEntry(struct vnt_private *pDevice, u16 wKeyCtl, u32 uEntryIdx, 
	int ii;

	u8 pbyData[24];



    if ( pDevice->byLocalID <= MAC_REVISION_A1 ) {

        if ( pDevice->sMgmtObj.byCSSPK == KEY_CTL_CCMP )

	if (pDevice->byLocalID <= MAC_REVISION_A1)

		if (pDevice->vnt_mgmt.byCSSPK == KEY_CTL_CCMP)

			return;

    }



    wOffset = MISCFIFO_KEYETRY0;

    wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE);