diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2007-10-25 17:15:27 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:03:11 -0800 |
| commit | 6994633357d3406dcd14e11d6ee61073b2251b72 (patch) | |
| tree | bc000261296c13dff1b4856dee2ae7dd512c06e8 /drivers/net/wireless | |
| parent | f1f1f5c730a3598b36989c63d387d9cab63161c7 (diff) | |
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: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwlwifi.h | 3 |
4 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index b8d43436d35..a80f620850d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c @@ -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; diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index d7e181f9ce8..67730e09729 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -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; diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index f6022649a6b..125d99e9476 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -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 = diff --git a/drivers/net/wireless/iwlwifi/iwlwifi.h b/drivers/net/wireless/iwlwifi/iwlwifi.h index bcff696937f..c5c9c5d7dce 100644 --- a/drivers/net/wireless/iwlwifi/iwlwifi.h +++ b/drivers/net/wireless/iwlwifi/iwlwifi.h @@ -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; |