evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
hw_value is u16 so fix all to the same size.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2015-01-19 18:24:11 +00:00 • committed by Greg Kroah-Hartman
parent d7a4cfa8c1
commit 63e8d787b0
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/vt6655/channel.c
View file

@ -197,11 +197,11 @@ bool set_channel(void *pDeviceHandler, struct ieee80211_channel *ch)
if (pDevice->byRFType == RF_AIROHA7230) if (pDevice->byRFType == RF_AIROHA7230)
RFbAL7230SelectChannelPostProcess(pDevice, pDevice->byCurrentCh, 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, bResult &= RFbSelectChannel(pDevice, pDevice->byRFType,
(unsigned char)ch->hw_value); ch->hw_value);
/* Init Synthesizer Table */ /* Init Synthesizer Table */
if (pDevice->bEnablePSMode) if (pDevice->bEnablePSMode)

2
drivers/staging/vt6655/device.h
View file

@ -367,7 +367,7 @@ struct vnt_private {
bool bIsBeaconBufReadySet; bool bIsBeaconBufReadySet;
unsigned int cbBeaconBufReadySetCnt; unsigned int cbBeaconBufReadySetCnt;
bool bFixRate; bool bFixRate;
unsigned char byCurrentCh; u16 byCurrentCh;
bool bAES; bool bAES;

12
drivers/staging/vt6655/rf.c
View file

@ -651,7 +651,8 @@ bool RFbInit(
* Return Value: true if succeeded; false if failed. * 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; bool bResult = true;
@ -687,7 +688,8 @@ bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType, unsigned
* Return Value: None. * 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; void __iomem *dwIoBase = priv->PortOffset;
int ii; int ii;
@ -767,7 +769,7 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType, unsig
bool RFbSetPower( bool RFbSetPower(
struct vnt_private *priv, struct vnt_private *priv,
unsigned int uRATE, unsigned int uRATE,
unsigned int uCH u16 uCH
) )
{ {
bool bResult = true; bool bResult = true;
@ -937,8 +939,8 @@ RFvRSSITodBm(
/* Post processing for the 11b/g and 11a. /* Post processing for the 11b/g and 11a.
* for save time on changing Reg2,3,5,7,10,12,15 */ * for save time on changing Reg2,3,5,7,10,12,15 */
bool RFbAL7230SelectChannelPostProcess(struct vnt_private *priv, bool RFbAL7230SelectChannelPostProcess(struct vnt_private *priv,
unsigned char byOldChannel, u16 byOldChannel,
unsigned char byNewChannel) u16 byNewChannel)
{ {
bool bResult; bool bResult;

8
drivers/staging/vt6655/rf.h
View file

@ -74,12 +74,12 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
bool IFRFbWriteEmbedded(struct vnt_private *, unsigned long dwData); 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( bool RFbInit(
struct vnt_private * struct vnt_private *
); );
bool RFvWriteWakeProgSyn(struct vnt_private *, unsigned char byRFType, unsigned int uChannel); bool RFvWriteWakeProgSyn(struct vnt_private *, unsigned char byRFType, u16);
bool RFbSetPower(struct vnt_private *, unsigned int uRATE, unsigned int uCH); bool RFbSetPower(struct vnt_private *, unsigned int uRATE, u16);
bool RFbRawSetPower( bool RFbRawSetPower(
struct vnt_private *, struct vnt_private *,
unsigned char byPwr, unsigned char byPwr,
@ -94,7 +94,7 @@ RFvRSSITodBm(
); );
//{{ RobertYu: 20050104 //{{ RobertYu: 20050104
bool RFbAL7230SelectChannelPostProcess(struct vnt_private *, unsigned char byOldChannel, unsigned char byNewChannel); bool RFbAL7230SelectChannelPostProcess(struct vnt_private *, u16, u16);
//}} RobertYu //}} RobertYu
#endif // __RF_H__ #endif // __RF_H__