Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Malcolm Priestley and committed by
Greg Kroah-Hartman
d7a4cfa8 2a0a7b3d

+8 -8
+6 -6
drivers/staging/vt6655/channel.c
··· 174 174 * Return Value: true if succeeded; false if failed. 175 175 * 176 176 */ 177 - bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel) 177 + bool set_channel(void *pDeviceHandler, struct ieee80211_channel *ch) 178 178 { 179 179 struct vnt_private *pDevice = pDeviceHandler; 180 180 bool bResult = true; 181 181 182 - if (pDevice->byCurrentCh == uConnectionChannel) 182 + if (pDevice->byCurrentCh == ch->hw_value) 183 183 return bResult; 184 184 185 185 /* Set VGA to max sensitivity */ ··· 197 197 198 198 if (pDevice->byRFType == RF_AIROHA7230) 199 199 RFbAL7230SelectChannelPostProcess(pDevice, pDevice->byCurrentCh, 200 - (unsigned char)uConnectionChannel); 200 + (unsigned char)ch->hw_value); 201 201 202 - pDevice->byCurrentCh = (unsigned char)uConnectionChannel; 202 + pDevice->byCurrentCh = (unsigned char)ch->hw_value; 203 203 bResult &= RFbSelectChannel(pDevice, pDevice->byRFType, 204 - (unsigned char)uConnectionChannel); 204 + (unsigned char)ch->hw_value); 205 205 206 206 /* Init Synthesizer Table */ 207 207 if (pDevice->bEnablePSMode) 208 - RFvWriteWakeProgSyn(pDevice, pDevice->byRFType, uConnectionChannel); 208 + RFvWriteWakeProgSyn(pDevice, pDevice->byRFType, ch->hw_value); 209 209 210 210 BBvSoftwareReset(pDevice); 211 211
+1 -1
drivers/staging/vt6655/channel.h
··· 27 27 28 28 void vnt_init_bands(struct vnt_private *); 29 29 30 - bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel); 30 + bool set_channel(void *pDeviceHandler, struct ieee80211_channel *); 31 31 32 32 #endif /* _CHANNEL_H_ */
+1 -1
drivers/staging/vt6655/device_main.c
··· 1420 1420 1421 1421 if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || 1422 1422 (conf->flags & IEEE80211_CONF_OFFCHANNEL)) { 1423 - set_channel(priv, conf->chandef.chan->hw_value); 1423 + set_channel(priv, conf->chandef.chan); 1424 1424 1425 1425 if (conf->chandef.chan->band == IEEE80211_BAND_5GHZ) 1426 1426 bb_type = BB_TYPE_11A;