From: Malcolm Priestley Date: Wed, 25 Jun 2014 20:14:33 +0000 (+0100) Subject: staging: vt6656: mac80211 conversion: vRunCommand channel changes X-Git-Tag: firefly_0821_release~176^2~3491^2~1482 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=63e754d407949a7b80ce4398b7c66e3d2edd2990;p=firefly-linux-kernel-4.4.55.git staging: vt6656: mac80211 conversion: vRunCommand channel changes pDevice->hw->conf.chandef.chan->hw_value to find current channel Remove bChannelSwitch, uCurrChannel, byNewChannel and bStopDataPkt Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 3095689094fe..81a6683f3b58 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -855,7 +855,7 @@ void vRunCommand(struct work_struct *work) case WLAN_CMD_SETPOWER_START: vnt_rf_setpower(pDevice, pDevice->wCurrentRate, - pMgmt->uCurrChannel); + pDevice->hw->conf.chandef.chan->hw_value); break; @@ -895,10 +895,7 @@ void vRunCommand(struct work_struct *work) break; case WLAN_CMD_11H_CHSW_START: - vnt_set_channel(pDevice, pDevice->byNewChannel); - pDevice->bChannelSwitch = false; - pMgmt->uCurrChannel = pDevice->byNewChannel; - pDevice->bStopDataPkt = false; + vnt_set_channel(pDevice, pDevice->hw->conf.chandef.chan->hw_value); break; case WLAN_CMD_CONFIGURE_FILTER_START: