Commit 69946333 authored by Tomas Winkler's avatar Tomas Winkler Committed by David S. Miller
Browse files

iwlwifi: remove cck_flag from iwl_driver_hw_info 



This patch remove cck_flag from iwl_driver_hw_info, this flag
is unused after spliting the iwl-base.c

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f1f1f5c7

drivers/net/wireless/iwlwifi/iwl-3945.c

+0 −1
Original line number Diff line number Diff line
@@ -2240,7 +2240,6 @@ int iwl_hw_set_hw_setting(struct iwl_priv *priv) 
	priv->hw_setting.tx_cmd_len = sizeof(struct iwl_tx_cmd);

	priv->hw_setting.max_rxq_size = RX_QUEUE_SIZE;

	priv->hw_setting.max_rxq_log = RX_QUEUE_SIZE_LOG;

	priv->hw_setting.cck_flag = 0;

	priv->hw_setting.max_stations = IWL3945_STATION_COUNT;

	priv->hw_setting.bcast_sta_id = IWL3945_BROADCAST_ID;

	return 0;

drivers/net/wireless/iwlwifi/iwl-4965.c

+0 −2
Original line number Diff line number Diff line
@@ -1721,8 +1721,6 @@ int iwl_hw_set_hw_setting(struct iwl_priv *priv) 


	priv->hw_setting.max_txq_num = iwl_param_queues_num;

	priv->hw_setting.ac_queue_count = AC_NUM;



	priv->hw_setting.cck_flag = RATE_MCS_CCK_MSK;

	priv->hw_setting.tx_cmd_len = sizeof(struct iwl_tx_cmd);

	priv->hw_setting.max_rxq_size = RX_QUEUE_SIZE;

	priv->hw_setting.max_rxq_log = RX_QUEUE_SIZE_LOG;

drivers/net/wireless/iwlwifi/iwl3945-base.c

+4 −2
Original line number Diff line number Diff line
@@ -506,8 +506,10 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags) 
	station->sta.sta.sta_id = index;

	station->sta.station_flags = 0;



	rate = (priv->phymode == MODE_IEEE80211A) ? IWL_RATE_6M_PLCP :

				IWL_RATE_1M_PLCP | priv->hw_setting.cck_flag;

	if (priv->phymode == MODE_IEEE80211A)

		rate = IWL_RATE_6M_PLCP;

	else

		rate =	IWL_RATE_1M_PLCP;



	/* Turn on both antennas for the station... */

	station->sta.rate_n_flags =

drivers/net/wireless/iwlwifi/iwlwifi.h

+1 −2
Original line number Diff line number Diff line
@@ -527,11 +527,10 @@ struct iwl_ibss_seq { 
struct iwl_driver_hw_info {

	u16 max_txq_num;

	u16 ac_queue_count;

	u32 rx_buffer_size;

	u16 tx_cmd_len;

	u16 max_rxq_size;

	u32 rx_buffer_size;

	u16 max_rxq_log;

	u32 cck_flag;

	u8  max_stations;

	u8  bcast_sta_id;

	void *shared_virt;