redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: vt6655: set_channel replace parameter with ieee80211_channel 

replacing uConnectionChannel for hw_value as set in vnt_init_bands.

This allows other signaling of ieee80211_channel to move deeper into
driver.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Malcolm Priestley 2015-01-19 18:24:10 +00:00 committed by Greg Kroah-Hartman
parent 2a0a7b3dfa
commit d7a4cfa8c1
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/vt6655/channel.c
View File

@ -174,12 +174,12 @@ void vnt_init_bands(struct vnt_private *priv)
* Return Value: true if succeeded; false if failed.
*
*/
bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
bool set_channel(void *pDeviceHandler, struct ieee80211_channel *ch)
{
struct vnt_private *pDevice = pDeviceHandler;
bool bResult = true;
if (pDevice->byCurrentCh == uConnectionChannel)
if (pDevice->byCurrentCh == ch->hw_value)
return bResult;
/* Set VGA to max sensitivity */
@ -197,15 +197,15 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
if (pDevice->byRFType == RF_AIROHA7230)
RFbAL7230SelectChannelPostProcess(pDevice, pDevice->byCurrentCh,
(unsigned char)uConnectionChannel);
(unsigned char)ch->hw_value);
pDevice->byCurrentCh = (unsigned char)uConnectionChannel;
pDevice->byCurrentCh = (unsigned char)ch->hw_value;
bResult &= RFbSelectChannel(pDevice, pDevice->byRFType,
(unsigned char)uConnectionChannel);
(unsigned char)ch->hw_value);
/* Init Synthesizer Table */
if (pDevice->bEnablePSMode)
RFvWriteWakeProgSyn(pDevice, pDevice->byRFType, uConnectionChannel);
RFvWriteWakeProgSyn(pDevice, pDevice->byRFType, ch->hw_value);
BBvSoftwareReset(pDevice);

2
drivers/staging/vt6655/channel.h
View File

@ -27,6 +27,6 @@
void vnt_init_bands(struct vnt_private *);
bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel);
bool set_channel(void *pDeviceHandler, struct ieee80211_channel *);
#endif /* _CHANNEL_H_ */

2
drivers/staging/vt6655/device_main.c
View File

@ -1420,7 +1420,7 @@ static int vnt_config(struct ieee80211_hw *hw, u32 changed)
if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) ||
(conf->flags & IEEE80211_CONF_OFFCHANNEL)) {
set_channel(priv, conf->chandef.chan->hw_value);
set_channel(priv, conf->chandef.chan);
if (conf->chandef.chan->band == IEEE80211_BAND_5GHZ)
bb_type = BB_TYPE_11A;