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

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

staging: vt6655: common variable size channel numbers to ieee80211_channel->hw_value 



hw_value is u16 so fix all to the same size.

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

drivers/staging/vt6655/channel.c

+3 −3
Original line number Diff line number Diff line
@@ -197,11 +197,11 @@ bool set_channel(void *pDeviceHandler, struct ieee80211_channel *ch) 


	if (pDevice->byRFType == RF_AIROHA7230)

		RFbAL7230SelectChannelPostProcess(pDevice, pDevice->byCurrentCh,

						  (unsigned char)ch->hw_value);

						  ch->hw_value);



	pDevice->byCurrentCh = (unsigned char)ch->hw_value;

	pDevice->byCurrentCh = ch->hw_value;

	bResult &= RFbSelectChannel(pDevice, pDevice->byRFType,

				    (unsigned char)ch->hw_value);

				    ch->hw_value);



	/* Init Synthesizer Table */

	if (pDevice->bEnablePSMode)

drivers/staging/vt6655/device.h

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ struct vnt_private { 
	bool bIsBeaconBufReadySet;

	unsigned int	cbBeaconBufReadySetCnt;

	bool bFixRate;

	unsigned char byCurrentCh;

	u16 byCurrentCh;



	bool bAES;

drivers/staging/vt6655/rf.c

+7 −5
Original line number Diff line number Diff line
@@ -651,7 +651,8 @@ bool RFbInit( 
 * Return Value: true if succeeded; false if failed.

 *

 */

bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType, unsigned char byChannel)

bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType,

		      u16 byChannel)

{

	bool bResult = true;
@@ -687,7 +688,8 @@ bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType, unsigned 
 * Return Value: None.

 *

 */

bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType, unsigned int uChannel)

bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType,

			 u16 uChannel)

{

	void __iomem *dwIoBase = priv->PortOffset;

	int   ii;
@@ -767,7 +769,7 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType, unsig 
bool RFbSetPower(

	struct vnt_private *priv,

	unsigned int uRATE,

	unsigned int uCH

	u16 uCH

)

{

	bool bResult = true;
@@ -937,8 +939,8 @@ RFvRSSITodBm( 
/* Post processing for the 11b/g and 11a.

 * for save time on changing Reg2,3,5,7,10,12,15 */

bool RFbAL7230SelectChannelPostProcess(struct vnt_private *priv,

				       unsigned char byOldChannel,

				       unsigned char byNewChannel)

				       u16 byOldChannel,

				       u16 byNewChannel)

{

	bool bResult;

drivers/staging/vt6655/rf.h

+4 −4
Original line number Diff line number Diff line
@@ -74,12 +74,12 @@ 
/*---------------------  Export Functions  --------------------------*/



bool IFRFbWriteEmbedded(struct vnt_private *, unsigned long dwData);

bool RFbSelectChannel(struct vnt_private *, unsigned char byRFType, unsigned char byChannel);

bool RFbSelectChannel(struct vnt_private *, unsigned char byRFType, u16);

bool RFbInit(

	struct vnt_private *

);

bool RFvWriteWakeProgSyn(struct vnt_private *, unsigned char byRFType, unsigned int uChannel);

bool RFbSetPower(struct vnt_private *, unsigned int uRATE, unsigned int uCH);

bool RFvWriteWakeProgSyn(struct vnt_private *, unsigned char byRFType, u16);

bool RFbSetPower(struct vnt_private *, unsigned int uRATE, u16);

bool RFbRawSetPower(

	struct vnt_private *,

	unsigned char byPwr,
@@ -94,7 +94,7 @@ RFvRSSITodBm( 
);



//{{ RobertYu: 20050104

bool RFbAL7230SelectChannelPostProcess(struct vnt_private *, unsigned char byOldChannel, unsigned char byNewChannel);

bool RFbAL7230SelectChannelPostProcess(struct vnt_private *, u16, u16);

//}} RobertYu



#endif // __RF_H__