staging: vt6656: mac80211 conversion: vRunCommand channel changes
authorMalcolm Priestley <tvboxspy@gmail.com>
Wed, 25 Jun 2014 20:14:33 +0000 (21:14 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2014 00:21:20 +0000 (20:21 -0400)
pDevice->hw->conf.chandef.chan->hw_value to find current channel

Remove bChannelSwitch, uCurrChannel, byNewChannel and bStopDataPkt

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/wcmd.c

index 3095689094fe1adb98fd45bfca322749791aa19e..81a6683f3b58214cdc98b91a1a17bc4eaf16c514 100644 (file)
@@ -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: