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

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

staging: vt6655: mac80211 conversion: changes to set channel 



Remove call to sChannelTbl, the channel under mac80211 is always valid.

CARDbSetPhyParameter is nolonger set here.

RFbSetPower is now set on byBBType

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

drivers/staging/vt6655/channel.c

+1 −11
Original line number Diff line number Diff line
@@ -665,16 +665,6 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel) 
	if (pDevice->byCurrentCh == uConnectionChannel)

		return bResult;



	if (!sChannelTbl[uConnectionChannel].bValid)

		return false;



	if ((uConnectionChannel > CB_MAX_CHANNEL_24G) &&

	    (pDevice->eCurrentPHYType != PHY_TYPE_11A)) {

		CARDbSetPhyParameter(pDevice, PHY_TYPE_11A, 0, 0, NULL, NULL);

	} else if ((uConnectionChannel <= CB_MAX_CHANNEL_24G) &&

		   (pDevice->eCurrentPHYType == PHY_TYPE_11A)) {

		CARDbSetPhyParameter(pDevice, PHY_TYPE_11G, 0, 0, NULL, NULL);

	}

	/* clear NAV */

	MACvRegBitsOn(pDevice->PortOffset, MAC_REG_MACCR, MACCR_CLRNAV);
@@ -702,7 +692,7 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel) 
		MACvSelectPage0(pDevice->PortOffset);

	}



	if (pDevice->eCurrentPHYType == PHY_TYPE_11B)

	if (pDevice->byBBType == BB_TYPE_11B)

		RFbSetPower(pDevice, RATE_1M, pDevice->byCurrentCh);

	else

		RFbSetPower(pDevice, RATE_6M, pDevice->byCurrentCh);