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

staging: vt6656: rename CARDbSetMediaChannel to vnt_set_channel 



Drop card and media and just use vnt_set_channel.

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

drivers/staging/vt6656/card.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static const u16 cwRXBCNTSFOff[MAX_RATE] = 
 *  Out:

 *      none

 */

void CARDbSetMediaChannel(struct vnt_private *priv, u32 connection_channel)

void vnt_set_channel(struct vnt_private *priv, u32 connection_channel)

{



	if (priv->byBBType == BB_TYPE_11A) {

drivers/staging/vt6656/card.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ typedef enum _CARD_PHY_TYPE { 


struct vnt_private;



void CARDbSetMediaChannel(struct vnt_private *pDevice, u32 uConnectionChannel);

void vnt_set_channel(struct vnt_private *, u32);

void CARDvSetRSPINF(struct vnt_private *, u8);

void vUpdateIFS(struct vnt_private *);

void CARDvUpdateBasicTopRate(struct vnt_private *);

drivers/staging/vt6656/main_usb.c

+2 −1
Original line number Diff line number Diff line
@@ -500,7 +500,8 @@ static int device_init_registers(struct vnt_private *pDevice) 
	pMgmt->eScanType = WMAC_SCAN_PASSIVE;

	pMgmt->uCurrChannel = pDevice->uChannel;

	pMgmt->uIBSSChannel = pDevice->uChannel;

	CARDbSetMediaChannel(pDevice, pMgmt->uCurrChannel);



	vnt_set_channel(pDevice, pMgmt->uCurrChannel);



	/* get permanent network address */

	memcpy(pDevice->abyPermanentNetAddr, init_rsp->net_addr, 6);

drivers/staging/vt6656/wcmd.c

+3 −3
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ void vRunCommand(struct work_struct *work) 
			}

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

			// Set channel

			CARDbSetMediaChannel(pDevice, pMgmt->uScanChannel);

			vnt_set_channel(pDevice, pMgmt->uScanChannel);

			// Set Baseband to be more sensitive.



			BBvSetShortSlotTime(pDevice);
@@ -387,7 +387,7 @@ void vRunCommand(struct work_struct *work) 
		// Set channel back

		vAdHocBeaconRestart(pDevice);

		// Set channel back

		CARDbSetMediaChannel(pDevice, pMgmt->uCurrChannel);

		vnt_set_channel(pDevice, pMgmt->uCurrChannel);

		// Set Filter

		if (pMgmt->bCurrBSSIDFilterOn) {

			MACvRegBitsOn(pDevice, MAC_REG_RCR, RCR_BSSID);
@@ -876,7 +876,7 @@ void vRunCommand(struct work_struct *work) 
		break;



	case WLAN_CMD_11H_CHSW_START:

		CARDbSetMediaChannel(pDevice, pDevice->byNewChannel);

		vnt_set_channel(pDevice, pDevice->byNewChannel);

		pDevice->bChannelSwitch = false;

		pMgmt->uCurrChannel = pDevice->byNewChannel;

		pDevice->bStopDataPkt = false;

drivers/staging/vt6656/wmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -2059,7 +2059,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus) 
        pMgmt->uIBSSChannel = DEFAULT_IBSS_CHANNEL;



    // set channel and clear NAV

    CARDbSetMediaChannel(pDevice, pMgmt->uIBSSChannel);

    vnt_set_channel(pDevice, pMgmt->uIBSSChannel);

    pMgmt->uCurrChannel = pMgmt->uIBSSChannel;



    pDevice->byPreambleType = pDevice->byShortPreamble;
@@ -2642,7 +2642,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, 
    }



    // set channel and clear NAV

    CARDbSetMediaChannel(pDevice, pCurr->uChannel);

    vnt_set_channel(pDevice, pCurr->uChannel);

    pMgmt->uCurrChannel = pCurr->uChannel;

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "<----s_bSynchBSS Set Channel [%d]\n", pCurr->uChannel);