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

staging: vt6656: dead code remove channel switch.

The driver needs to do anything special for channel switch.

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
bab97c05 43fd1924

+1 -23
-4
drivers/staging/vt6656/device.h
··· 391 391 /* command timer */ 392 392 struct delayed_work run_command_work; 393 393 394 - int bChannelSwitch; 395 - u8 byNewChannel; 396 - u8 byChannelSwitchCount; 397 - 398 394 struct ieee80211_low_level_stats low_stats; 399 395 }; 400 396
-8
drivers/staging/vt6656/int.c
··· 153 153 if (priv->hw->conf.flags & IEEE80211_CONF_PS) 154 154 vnt_schedule_command(priv, 155 155 WLAN_CMD_TBTT_WAKEUP); 156 - #if 0 /* TODO channel switch */ 157 - if (priv->bChannelSwitch) { 158 - priv->byChannelSwitchCount--; 159 - if (priv->byChannelSwitchCount == 0) 160 - vnt_schedule_command(priv, 161 - WLAN_CMD_11H_CHSW); 162 - } 163 - #endif 164 156 } 165 157 priv->current_tsf = le64_to_cpu(int_data->tsf); 166 158
-8
drivers/staging/vt6656/wcmd.c
··· 83 83 priv->command_state = WLAN_CMD_CHANGE_ANTENNA_START; 84 84 break; 85 85 86 - case WLAN_CMD_11H_CHSW: 87 - priv->command_state = WLAN_CMD_11H_CHSW_START; 88 - break; 89 - 90 86 default: 91 87 break; 92 88 } ··· 157 161 else 158 162 vnt_set_antenna_mode(priv, ANT_RXA); 159 163 } 160 - break; 161 - 162 - case WLAN_CMD_11H_CHSW_START: 163 - vnt_set_channel(priv, priv->hw->conf.chandef.chan->hw_value); 164 164 break; 165 165 166 166 default:
+1 -3
drivers/staging/vt6656/wcmd.h
··· 40 40 WLAN_CMD_SETPOWER, 41 41 WLAN_CMD_TBTT_WAKEUP, 42 42 WLAN_CMD_BECON_SEND, 43 - WLAN_CMD_CHANGE_ANTENNA, 44 - WLAN_CMD_11H_CHSW, 43 + WLAN_CMD_CHANGE_ANTENNA 45 44 }; 46 45 47 46 #define CMD_Q_SIZE 32 ··· 52 53 WLAN_CMD_TBTT_WAKEUP_START, 53 54 WLAN_CMD_BECON_SEND_START, 54 55 WLAN_CMD_CHANGE_ANTENNA_START, 55 - WLAN_CMD_11H_CHSW_START, 56 56 WLAN_CMD_IDLE 57 57 }; 58 58