diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-04-28 05:51:29 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-29 15:36:14 -0400 |
commit | 7a55237ac9f133c1d48fbe54d22dc2bd715e7b51 (patch) | |
tree | 168eb916d898529bcc20b7c69476f335fd30d8c5 | |
parent | 5855c7d81530aaf82293aaa252c4f9ff69ef33f9 (diff) |
iwlegacy: remove scan_tx_antennas
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-4965-lib.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-core.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c index 5a8a3cce27bc..7e5e85a017b5 100644 --- a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c +++ b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c | |||
@@ -955,9 +955,6 @@ int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) | |||
955 | if (priv->cfg->scan_rx_antennas[band]) | 955 | if (priv->cfg->scan_rx_antennas[band]) |
956 | rx_ant = priv->cfg->scan_rx_antennas[band]; | 956 | rx_ant = priv->cfg->scan_rx_antennas[band]; |
957 | 957 | ||
958 | if (priv->cfg->scan_tx_antennas[band]) | ||
959 | scan_tx_antennas = priv->cfg->scan_tx_antennas[band]; | ||
960 | |||
961 | priv->scan_tx_ant[band] = iwl4965_toggle_tx_ant(priv, | 958 | priv->scan_tx_ant[band] = iwl4965_toggle_tx_ant(priv, |
962 | priv->scan_tx_ant[band], | 959 | priv->scan_tx_ant[band], |
963 | scan_tx_antennas); | 960 | scan_tx_antennas); |
diff --git a/drivers/net/wireless/iwlegacy/iwl-core.h b/drivers/net/wireless/iwlegacy/iwl-core.h index f03b463e4378..bc66c604106c 100644 --- a/drivers/net/wireless/iwlegacy/iwl-core.h +++ b/drivers/net/wireless/iwlegacy/iwl-core.h | |||
@@ -287,7 +287,6 @@ struct iwl_cfg { | |||
287 | struct iwl_base_params *base_params; | 287 | struct iwl_base_params *base_params; |
288 | /* params likely to change within a device family */ | 288 | /* params likely to change within a device family */ |
289 | u8 scan_rx_antennas[IEEE80211_NUM_BANDS]; | 289 | u8 scan_rx_antennas[IEEE80211_NUM_BANDS]; |
290 | u8 scan_tx_antennas[IEEE80211_NUM_BANDS]; | ||
291 | enum iwl_led_mode led_mode; | 290 | enum iwl_led_mode led_mode; |
292 | }; | 291 | }; |
293 | 292 | ||