iwlwifi: Add tx_ant_num hw setting variable

Added tx_ant_num variable into hw_setting
This will be used for scanning TX antenna toggling
On the way removed ac_queue_num unused

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 50d927bb21702b368f8865a93f69a9b0d0813386..82d282730b755b5744ec9ba8f7c5da3ff8fe1d3e 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -2300,7 +2300,6 @@ int iwl3945_hw_set_hw_setting(struct iwl3945_priv *priv)
                return -ENOMEM;
        }
 
-       priv->hw_setting.ac_queue_count = AC_NUM;
        priv->hw_setting.rx_buf_size = IWL_RX_BUF_SIZE;
        priv->hw_setting.max_pkt_size = 2342;
        priv->hw_setting.tx_cmd_len = sizeof(struct iwl3945_tx_cmd);
@@ -2308,6 +2307,8 @@ int iwl3945_hw_set_hw_setting(struct iwl3945_priv *priv)
        priv->hw_setting.max_rxq_log = RX_QUEUE_SIZE_LOG;
        priv->hw_setting.max_stations = IWL3945_STATION_COUNT;
        priv->hw_setting.bcast_sta_id = IWL3945_BROADCAST_ID;
+
+       priv->hw_setting.tx_ant_num = 2;
        return 0;
 }
 

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h
index 393cff6f2270ca6e1ebb24e3f693d19d53113d90..dde389d316376f4dcd02315563944a41fc264ea4 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
@@ -508,8 +508,8 @@ struct iwl3945_ibss_seq {
 /**
  * struct iwl3945_driver_hw_info
  * @max_txq_num: Max # Tx queues supported
- * @ac_queue_count: # Tx queues for EDCA Access Categories (AC)
  * @tx_cmd_len: Size of Tx command (but not including frame itself)
+ * @tx_ant_num: Number of TX antennas
  * @max_rxq_size: Max # Rx frames in Rx queue (must be power-of-2)
  * @rx_buf_size:
  * @max_pkt_size:
@@ -521,8 +521,8 @@ struct iwl3945_ibss_seq {
  */
 struct iwl3945_driver_hw_info {
        u16 max_txq_num;
-       u16 ac_queue_count;
        u16 tx_cmd_len;
+       u16 tx_ant_num;
        u16 max_rxq_size;
        u32 rx_buf_size;
        u32 max_pkt_size;

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index cc141f8ba61662cd62eb524747d51d5fe3d63dc8..237d3b24dd200a0bf1d2b4858bcc9d0a8435b244 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -1794,7 +1794,6 @@ int iwl4965_hw_set_hw_setting(struct iwl4965_priv *priv)
        memset(priv->hw_setting.shared_virt, 0, sizeof(struct iwl4965_shared));
 
        priv->hw_setting.max_txq_num = iwl4965_param_queues_num;
-       priv->hw_setting.ac_queue_count = AC_NUM;
        priv->hw_setting.tx_cmd_len = sizeof(struct iwl4965_tx_cmd);
        priv->hw_setting.max_rxq_size = RX_QUEUE_SIZE;
        priv->hw_setting.max_rxq_log = RX_QUEUE_SIZE_LOG;
@@ -1805,6 +1804,9 @@ int iwl4965_hw_set_hw_setting(struct iwl4965_priv *priv)
        priv->hw_setting.max_pkt_size = priv->hw_setting.rx_buf_size - 256;
        priv->hw_setting.max_stations = IWL4965_STATION_COUNT;
        priv->hw_setting.bcast_sta_id = IWL4965_BROADCAST_ID;
+
+       priv->hw_setting.tx_ant_num = 2;
+
        return 0;
 }
 

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.h b/drivers/net/wireless/iwlwifi/iwl-4965.h
index 67189ab93dbe45957352b007d94d80f010aa1ce7..ce17e4fec8384c187e6c0971aab785de5a985326 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-4965.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.h
@@ -580,8 +580,8 @@ struct iwl4965_ibss_seq {
 /**
  * struct iwl4965_driver_hw_info
  * @max_txq_num: Max # Tx queues supported
- * @ac_queue_count: # Tx queues for EDCA Access Categories (AC)
  * @tx_cmd_len: Size of Tx command (but not including frame itself)
+ * @tx_ant_num: Number of TX antennas
  * @max_rxq_size: Max # Rx frames in Rx queue (must be power-of-2)
  * @rx_buffer_size:
  * @max_rxq_log: Log-base-2 of max_rxq_size
@@ -592,8 +592,8 @@ struct iwl4965_ibss_seq {
  */
 struct iwl4965_driver_hw_info {
        u16 max_txq_num;
-       u16 ac_queue_count;
        u16 tx_cmd_len;
+       u16 tx_ant_num;
        u16 max_rxq_size;
        u32 rx_buf_size;
        u32 max_pkt_size;