diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-12-23 15:12:30 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-01-04 14:35:11 -0500 |
| commit | cd017f25e391dfabaca185bb4a5aefd02fd6c0ca (patch) | |
| tree | 19a121d534e8604e37aac8a9290baa0365547035 /drivers/net/wireless/iwlwifi/iwl-6000.c | |
| parent | cd2c5486526b744fb505e18c9d981b35feaf283a (diff) | |
| download | lwn-cd017f25e391dfabaca185bb4a5aefd02fd6c0ca.tar.gz lwn-cd017f25e391dfabaca185bb4a5aefd02fd6c0ca.zip | |
iwlagn: fix scan tx antenna setting on 5Ghz band
Looks that we do not set correctly antennas when scanning
on 5Ghz band and when bluetooth is enabled, because
priv->cfg->scan_tx_antennas[band] is only defined for
IEEE80211_BAND_2GHZ.
To fix we check band before limiting antennas to first one.
This allow to remove hard coded cfg->scan_tx_antennas[band].
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index f4bec3201ef9..af505bcd7ae0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c @@ -596,12 +596,7 @@ struct iwl_cfg iwl6005_2bg_cfg = { .need_dc_calib = true, \ .need_temp_offset_calib = true, \ .led_mode = IWL_LED_RF_STATE, \ - .adv_pm = true, \ - /* \ - *Due to bluetooth, we transmit 2.4 GHz probes \ - * only on antenna A \ - */ \ - .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A + .adv_pm = true \ struct iwl_cfg iwl6030_2agn_cfg = { .name = "Intel(R) Centrino(R) Advanced-N 6230 AGN", |