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>

diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 101d0ca8bf1eacac716ea398d9e4df0d687db4fb..120d3250626d5f1c9dd25690958aa35ecd08f34e 100644 (file)
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -391,10 +391,6 @@ struct vnt_private {
        /* command timer */
        struct delayed_work run_command_work;
 
-       int bChannelSwitch;
-       u8 byNewChannel;
-       u8 byChannelSwitchCount;
-
        struct ieee80211_low_level_stats low_stats;
 };
 

diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index 9c5fefc6ab727ac1c7d1091f5313695d2aec943b..2ef70e4701f69af603c3c55ad3bb8e1f7a542e60 100644 (file)
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -153,14 +153,6 @@ void vnt_int_process_data(struct vnt_private *priv)
                        if (priv->hw->conf.flags & IEEE80211_CONF_PS)
                                vnt_schedule_command(priv,
                                                        WLAN_CMD_TBTT_WAKEUP);
-#if 0 /* TODO channel switch */
-                       if (priv->bChannelSwitch) {
-                               priv->byChannelSwitchCount--;
-                               if (priv->byChannelSwitchCount == 0)
-                                       vnt_schedule_command(priv,
-                                                       WLAN_CMD_11H_CHSW);
-                       }
-#endif
                }
                priv->current_tsf = le64_to_cpu(int_data->tsf);
 

diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index a63d0fd2842358ce9e77de834ed559b7470bda30..e4a5e2bead70e86e450e937f3569d6cfa6e04767 100644 (file)
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -83,10 +83,6 @@ static int vnt_cmd_complete(struct vnt_private *priv)
                priv->command_state = WLAN_CMD_CHANGE_ANTENNA_START;
                break;
 
-       case WLAN_CMD_11H_CHSW:
-               priv->command_state = WLAN_CMD_11H_CHSW_START;
-               break;
-
        default:
                break;
        }
@@ -163,10 +159,6 @@ void vnt_run_command(struct work_struct *work)
                }
                break;
 
-       case WLAN_CMD_11H_CHSW_START:
-               vnt_set_channel(priv, priv->hw->conf.chandef.chan->hw_value);
-               break;
-
        default:
                break;
        }

diff --git a/drivers/staging/vt6656/wcmd.h b/drivers/staging/vt6656/wcmd.h
index 0fc2c402fef3afbca42eb17bd7c0055e57454339..79df04a6afaefa87eb6a813b1d7937253674add3 100644 (file)
--- a/drivers/staging/vt6656/wcmd.h
+++ b/drivers/staging/vt6656/wcmd.h
@@ -40,8 +40,7 @@ enum vnt_cmd {
        WLAN_CMD_SETPOWER,
        WLAN_CMD_TBTT_WAKEUP,
        WLAN_CMD_BECON_SEND,
-       WLAN_CMD_CHANGE_ANTENNA,
-       WLAN_CMD_11H_CHSW,
+       WLAN_CMD_CHANGE_ANTENNA
 };
 
 #define CMD_Q_SIZE              32
@@ -53,7 +52,6 @@ enum vnt_cmd_state {
        WLAN_CMD_TBTT_WAKEUP_START,
        WLAN_CMD_BECON_SEND_START,
        WLAN_CMD_CHANGE_ANTENNA_START,
-       WLAN_CMD_11H_CHSW_START,
        WLAN_CMD_IDLE
 };