redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

iwlwifi: remove cck_flag from iwl_driver_hw_info

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

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Tomas Winkler 2007-10-25 17:15:27 +08:00 committed by David S. Miller
parent f1f1f5c730
commit 6994633357
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/wireless/iwlwifi/iwl-3945.c
View file

@ -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;

2
drivers/net/wireless/iwlwifi/iwl-4965.c
View file

@ -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;

6
drivers/net/wireless/iwlwifi/iwl3945-base.c
View file

@ -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 =

3
drivers/net/wireless/iwlwifi/iwlwifi.h
View file

@ -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;