Commit bab97c05 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: dead code remove channel switch. 



The driver needs to do anything special for channel switch.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 43fd1924

drivers/staging/vt6656/device.h

+0 −4
Original line number Diff line number Diff line
@@ -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;

};

drivers/staging/vt6656/int.c

+0 −8
Original line number Diff line number Diff line
@@ -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);

drivers/staging/vt6656/wcmd.c

+0 −8
Original line number Diff line number Diff line
@@ -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;

	}

drivers/staging/vt6656/wcmd.h

+1 −3
Original line number Diff line number Diff line
@@ -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

};