From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mga09.intel.com ([134.134.136.24]:46186 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932243Ab0LTSOm (ORCPT ); Mon, 20 Dec 2010 13:14:42 -0500 Subject: Re: [PATCH] iwlagn: fix scan tx antenna setting on 5Ghz band From: "Guy, Wey-Yi" To: Stanislaw Gruszka Cc: Intel Linux Wireless , Johannes Berg , "linux-wireless@vger.kernel.org" In-Reply-To: <1292864713-2756-1-git-send-email-sgruszka@redhat.com> References: <1292864713-2756-1-git-send-email-sgruszka@redhat.com> Content-Type: text/plain Date: Mon, 20 Dec 2010 10:13:36 -0800 Message-Id: <1292868816.22230.45.camel@wwguy-ubuntu> Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: Hi Stanislaw, On Mon, 2010-12-20 at 09:05 -0800, Stanislaw Gruszka wrote: > 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. This fix choose first valid antenna. > > Signed-off-by: Stanislaw Gruszka > --- > drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c > index 4bc82fc..099039c 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c > +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c > @@ -1499,8 +1499,7 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) > priv->cfg->bt_params->advanced_bt_coexist && > priv->bt_full_concurrent) { > /* operated as 1x1 in full concurrency mode */ > - scan_tx_antennas = first_antenna( > - priv->cfg->scan_tx_antennas[band]); > + scan_tx_antennas = first_antenna(scan_tx_antennas); If its is 2.4, we need to use the correct tx antenna, I think we can remove this block of code all together since check already done above. if (priv->cfg->scan_tx_antennas[band]) scan_tx_antennas = priv->cfg->scan_tx_antennas[band]; Wey