From b7cfd59ac2c41c23a51027c2c671138b050facbb Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 15 Mar 2012 13:26:50 -0700 Subject: [PATCH] --- yaml --- r: 300647 b: refs/heads/master c: 6a22f10c45f81cb66770b9432ca971375ccc2000 h: refs/heads/master i: 300645: 5fd3f7bb539392f8c671f547157aecadc9cd314b 300643: 0c28c0f3e4df61b8448aab7edfe57b435a4f6455 300639: 9fe37c075e9fce3d72a3a77524efc91668910d72 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-scan.c | 3 --- trunk/drivers/net/wireless/iwlwifi/iwl-shared.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7b3831305170..4b63a65c4afe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf61686a77607effdad45107161a8ff4e34d1f08 +refs/heads/master: 6a22f10c45f81cb66770b9432ca971375ccc2000 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c index 902efe4bc898..863ad0c4d50f 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -793,9 +793,6 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) band = priv->scan_band; - if (cfg(priv)->scan_rx_antennas[band]) - rx_ant = cfg(priv)->scan_rx_antennas[band]; - if (band == IEEE80211_BAND_2GHZ && cfg(priv)->bt_params && cfg(priv)->bt_params->advanced_bt_coexist) { diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h index 229c4b903778..f53feb8b5e85 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h @@ -297,7 +297,6 @@ struct iwl_ht_params { * @need_temp_offset_calib: need to perform temperature offset calibration * @no_xtal_calib: some devices do not need crystal calibration data, * don't send it to those - * @scan_rx_antennas: available antenna for scan operation * @led_mode: 0=blinking, 1=On(RF On)/Off(RF Off) * @adv_pm: advance power management * @rx_with_siso_diversity: 1x1 device with rx antenna diversity @@ -330,7 +329,6 @@ struct iwl_cfg { const struct iwl_bt_params *bt_params; const bool need_temp_offset_calib; /* if used set to true */ const bool no_xtal_calib; - u8 scan_rx_antennas[IEEE80211_NUM_BANDS]; enum iwl_led_mode led_mode; const bool adv_pm; const bool rx_with_siso_diversity;