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

staging: vt6656: rename CARDvSetBSSMode to vnt_set_bss_mode 



drop card and rename to vnt_set_bss_mode

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

drivers/staging/vt6656/card.c

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ int vnt_radio_power_on(struct vnt_private *priv) 
	return ret;

}



void CARDvSetBSSMode(struct vnt_private *priv)

void vnt_set_bss_mode(struct vnt_private *priv)

{

	if (priv->byRFType == RF_AIROHA7230 && priv->byBBType == BB_TYPE_11A)

		MACvSetBBType(priv, BB_TYPE_11G);

drivers/staging/vt6656/card.h

+1 −1
Original line number Diff line number Diff line
@@ -61,6 +61,6 @@ u64 vnt_get_tsf_offset(u8 byRxRate, u64 qwTSF1, u64 qwTSF2); 
int vnt_radio_power_off(struct vnt_private *);

int vnt_radio_power_on(struct vnt_private *);

u8 vnt_get_pkt_type(struct vnt_private *);

void CARDvSetBSSMode(struct vnt_private *pDevice);

void vnt_set_bss_mode(struct vnt_private *);



#endif /* __CARD_H__ */

drivers/staging/vt6656/main_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static int device_init_registers(struct vnt_private *pDevice) 
	}



	BBvSetShortSlotTime(pDevice);

	CARDvSetBSSMode(pDevice);

	vnt_set_bss_mode(pDevice);



	pDevice->byBBVGACurrent = pDevice->abyBBVGA[0];

	pDevice->byBBVGANew = pDevice->byBBVGACurrent;

drivers/staging/vt6656/wcmd.c

+3 −3
Original line number Diff line number Diff line
@@ -333,11 +333,11 @@ void vRunCommand(struct work_struct *work) 
			if ((pDevice->byBBType != BB_TYPE_11A) &&

			    (pMgmt->uScanChannel > CB_MAX_CHANNEL_24G)) {

				pDevice->byBBType = BB_TYPE_11A;

				CARDvSetBSSMode(pDevice);

				vnt_set_bss_mode(pDevice);

			} else if ((pDevice->byBBType == BB_TYPE_11A) &&

				   (pMgmt->uScanChannel <= CB_MAX_CHANNEL_24G)) {

				pDevice->byBBType = BB_TYPE_11G;

				CARDvSetBSSMode(pDevice);

				vnt_set_bss_mode(pDevice);

			}

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning....  channel: [%d]\n", pMgmt->uScanChannel);

			// Set channel
@@ -377,7 +377,7 @@ void vRunCommand(struct work_struct *work) 
		// Set Baseband's sensitivity back.

		if (pDevice->byBBType != pDevice->byScanBBType) {

			pDevice->byBBType = pDevice->byScanBBType;

			CARDvSetBSSMode(pDevice);

			vnt_set_bss_mode(pDevice);

		}



		BBvSetShortSlotTime(pDevice);

drivers/staging/vt6656/wmgr.c

+5 −5
Original line number Diff line number Diff line
@@ -2081,7 +2081,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus) 
    // vUpdateIFS() use pDevice->bShortSlotTime as parameter so it must be called

    // after setting ShortSlotTime.

    // CARDvSetBSSMode call vUpdateIFS()

    CARDvSetBSSMode(pDevice);

    vnt_set_bss_mode(pDevice);



    if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {

        MACvRegBitsOn(pDevice, MAC_REG_HOSTCR, HOSTCR_AP);
@@ -2601,7 +2601,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, 
            pMgmt->eCurrentPHYMode = PHY_TYPE_11A;

            pDevice->bShortSlotTime = true;

            BBvSetShortSlotTime(pDevice);

            CARDvSetBSSMode(pDevice);

	    vnt_set_bss_mode(pDevice);

        } else {

            return;

        }
@@ -2613,7 +2613,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, 
            pMgmt->eCurrentPHYMode = PHY_TYPE_11B;

            pDevice->bShortSlotTime = false;

            BBvSetShortSlotTime(pDevice);

            CARDvSetBSSMode(pDevice);

	    vnt_set_bss_mode(pDevice);

        } else {

            return;

        }
@@ -2624,12 +2624,12 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, 
            pMgmt->eCurrentPHYMode = PHY_TYPE_11G;

            pDevice->bShortSlotTime = true;

            BBvSetShortSlotTime(pDevice);

            CARDvSetBSSMode(pDevice);

	    vnt_set_bss_mode(pDevice);

        } else if (pDevice->eConfigPHYMode == PHY_TYPE_11B) {

            pDevice->byBBType = BB_TYPE_11B;

            pDevice->bShortSlotTime = false;

            BBvSetShortSlotTime(pDevice);

            CARDvSetBSSMode(pDevice);

	    vnt_set_bss_mode(pDevice);

        } else {

            return;

        }