提交 69946333 编写于 作者: T Tomas Winkler 提交者: David S. Miller

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: NTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: NZhu Yi <yi.zhu@intel.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 f1f1f5c7
...@@ -2240,7 +2240,6 @@ int iwl_hw_set_hw_setting(struct iwl_priv *priv) ...@@ -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.tx_cmd_len = sizeof(struct iwl_tx_cmd);
priv->hw_setting.max_rxq_size = RX_QUEUE_SIZE; priv->hw_setting.max_rxq_size = RX_QUEUE_SIZE;
priv->hw_setting.max_rxq_log = RX_QUEUE_SIZE_LOG; 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.max_stations = IWL3945_STATION_COUNT;
priv->hw_setting.bcast_sta_id = IWL3945_BROADCAST_ID; priv->hw_setting.bcast_sta_id = IWL3945_BROADCAST_ID;
return 0; return 0;
......
...@@ -1721,8 +1721,6 @@ int iwl_hw_set_hw_setting(struct iwl_priv *priv) ...@@ -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.max_txq_num = iwl_param_queues_num;
priv->hw_setting.ac_queue_count = AC_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.tx_cmd_len = sizeof(struct iwl_tx_cmd);
priv->hw_setting.max_rxq_size = RX_QUEUE_SIZE; priv->hw_setting.max_rxq_size = RX_QUEUE_SIZE;
priv->hw_setting.max_rxq_log = RX_QUEUE_SIZE_LOG; priv->hw_setting.max_rxq_log = RX_QUEUE_SIZE_LOG;
......
...@@ -506,8 +506,10 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags) ...@@ -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.sta.sta_id = index;
station->sta.station_flags = 0; station->sta.station_flags = 0;
rate = (priv->phymode == MODE_IEEE80211A) ? IWL_RATE_6M_PLCP : if (priv->phymode == MODE_IEEE80211A)
IWL_RATE_1M_PLCP | priv->hw_setting.cck_flag; rate = IWL_RATE_6M_PLCP;
else
rate = IWL_RATE_1M_PLCP;
/* Turn on both antennas for the station... */ /* Turn on both antennas for the station... */
station->sta.rate_n_flags = station->sta.rate_n_flags =
......
...@@ -527,11 +527,10 @@ struct iwl_ibss_seq { ...@@ -527,11 +527,10 @@ struct iwl_ibss_seq {
struct iwl_driver_hw_info { struct iwl_driver_hw_info {
u16 max_txq_num; u16 max_txq_num;
u16 ac_queue_count; u16 ac_queue_count;
u32 rx_buffer_size;
u16 tx_cmd_len; u16 tx_cmd_len;
u16 max_rxq_size; u16 max_rxq_size;
u32 rx_buffer_size;
u16 max_rxq_log; u16 max_rxq_log;
u32 cck_flag;
u8 max_stations; u8 max_stations;
u8 bcast_sta_id; u8 bcast_sta_id;
void *shared_virt; void *shared_virt;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册