* [PATCH] iwlagn: fix scan tx antenna setting on 5Ghz band @ 2010-12-20 17:05 Stanislaw Gruszka 2010-12-20 18:13 ` Guy, Wey-Yi 0 siblings, 1 reply; 6+ messages in thread From: Stanislaw Gruszka @ 2010-12-20 17:05 UTC (permalink / raw) To: Wey-Yi Guy, Intel Linux Wireless Cc: Johannes Berg, linux-wireless, Stanislaw Gruszka 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 <sgruszka@redhat.com> --- 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); } priv->scan_tx_ant[band] = iwl_toggle_tx_ant(priv, priv->scan_tx_ant[band], -- 1.7.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] iwlagn: fix scan tx antenna setting on 5Ghz band 2010-12-20 17:05 [PATCH] iwlagn: fix scan tx antenna setting on 5Ghz band Stanislaw Gruszka @ 2010-12-20 18:13 ` Guy, Wey-Yi 2010-12-21 12:05 ` Stanislaw Gruszka 0 siblings, 1 reply; 6+ messages in thread From: Guy, Wey-Yi @ 2010-12-20 18:13 UTC (permalink / raw) To: Stanislaw Gruszka Cc: Intel Linux Wireless, Johannes Berg, linux-wireless@vger.kernel.org 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 <sgruszka@redhat.com> > --- > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] iwlagn: fix scan tx antenna setting on 5Ghz band 2010-12-20 18:13 ` Guy, Wey-Yi @ 2010-12-21 12:05 ` Stanislaw Gruszka 2010-12-21 17:21 ` Guy, Wey-Yi 0 siblings, 1 reply; 6+ messages in thread From: Stanislaw Gruszka @ 2010-12-21 12:05 UTC (permalink / raw) To: Guy, Wey-Yi Cc: Intel Linux Wireless, Johannes Berg, linux-wireless@vger.kernel.org Hi Wey On Mon, Dec 20, 2010 at 10:13:36AM -0800, Guy, Wey-Yi wrote: > 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 <sgruszka@redhat.com> > > --- > > 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]; Is correct to use all antennas on 5GHz when blutooth is enabled? For me, more logical would be limiting to one antenna no matter of band, since antennas are used anyway, only frequencies differ. For rx_ant, we do not check the band, only limit to first one when bluetooth is used. Stanislaw ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] iwlagn: fix scan tx antenna setting on 5Ghz band 2010-12-21 12:05 ` Stanislaw Gruszka @ 2010-12-21 17:21 ` Guy, Wey-Yi 2010-12-22 13:15 ` Stanislaw Gruszka 0 siblings, 1 reply; 6+ messages in thread From: Guy, Wey-Yi @ 2010-12-21 17:21 UTC (permalink / raw) To: Stanislaw Gruszka Cc: Intel Linux Wireless, Johannes Berg, linux-wireless@vger.kernel.org Hi Stanislaw, On Tue, 2010-12-21 at 04:05 -0800, Stanislaw Gruszka wrote: > Hi Wey > > On Mon, Dec 20, 2010 at 10:13:36AM -0800, Guy, Wey-Yi wrote: > > 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 <sgruszka@redhat.com> > > > --- > > > 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]; > > Is correct to use all antennas on 5GHz when blutooth is enabled? > For me, more logical would be limiting to one antenna no matter of band, > since antennas are used anyway, only frequencies differ. > > For rx_ant, we do not check the band, only limit to first one > when bluetooth is used. there is no BT coex if 5GHz is used because there is not interference between 2.4 and 5GHz, so both antenna can be used. WiFi should operated in normal condition. For 2.4GHz, we also can use both antenna if there is not high traffic load on BT side. but you have a good catch, driver need to check band before use it (scan_tx_antenna[band]) Thanks Wey ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] iwlagn: fix scan tx antenna setting on 5Ghz band 2010-12-21 17:21 ` Guy, Wey-Yi @ 2010-12-22 13:15 ` Stanislaw Gruszka 2010-12-22 16:57 ` Guy, Wey-Yi 0 siblings, 1 reply; 6+ messages in thread From: Stanislaw Gruszka @ 2010-12-22 13:15 UTC (permalink / raw) To: Guy, Wey-Yi Cc: Intel Linux Wireless, Johannes Berg, linux-wireless@vger.kernel.org Hi Wey > > > 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]; > > > > Is correct to use all antennas on 5GHz when blutooth is enabled? > > For me, more logical would be limiting to one antenna no matter of band, > > since antennas are used anyway, only frequencies differ. > > > > For rx_ant, we do not check the band, only limit to first one > > when bluetooth is used. > > there is no BT coex if 5GHz is used because there is not interference > between 2.4 and 5GHz, so both antenna can be used. WiFi should operated > in normal condition. > > For 2.4GHz, we also can use both antenna if there is not high traffic > load on BT side. > > but you have a good catch, driver need to check band before use it > (scan_tx_antenna[band]) So how about this patch (rfc only): >From 26d0570ed5cd85097702d0fedb2c3f831dce9714 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka <sgruszka@redhat.com> Date: Wed, 22 Dec 2010 13:03:31 +0100 Subject: [RFC PATCH] 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> --- drivers/net/wireless/iwlwifi/iwl-6000.c | 7 +------ drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 9 +++------ drivers/net/wireless/iwlwifi/iwl-core.h | 1 - 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index f4bec32..af505bc 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", diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index 4bc82fc..322a2bd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c @@ -1492,15 +1492,12 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) if (priv->cfg->scan_rx_antennas[band]) rx_ant = priv->cfg->scan_rx_antennas[band]; - if (priv->cfg->scan_tx_antennas[band]) - scan_tx_antennas = priv->cfg->scan_tx_antennas[band]; - - if (priv->cfg->bt_params && + if (band == IEEE80211_BAND_2GHZ && + priv->cfg->bt_params && 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); } priv->scan_tx_ant[band] = iwl_toggle_tx_ant(priv, priv->scan_tx_ant[band], diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index f80685a..a347437 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h @@ -411,7 +411,6 @@ struct iwl_cfg { const bool need_dc_calib; /* if used set to true */ const bool need_temp_offset_calib; /* if used set to true */ u8 scan_rx_antennas[IEEE80211_NUM_BANDS]; - u8 scan_tx_antennas[IEEE80211_NUM_BANDS]; enum iwl_led_mode led_mode; const bool adv_pm; const bool rx_with_siso_diversity; -- 1.7.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] iwlagn: fix scan tx antenna setting on 5Ghz band 2010-12-22 13:15 ` Stanislaw Gruszka @ 2010-12-22 16:57 ` Guy, Wey-Yi 0 siblings, 0 replies; 6+ messages in thread From: Guy, Wey-Yi @ 2010-12-22 16:57 UTC (permalink / raw) To: Stanislaw Gruszka Cc: Intel Linux Wireless, Johannes Berg, linux-wireless@vger.kernel.org Stanislaw, On Wed, 2010-12-22 at 05:15 -0800, Stanislaw Gruszka wrote: > Hi Wey > > > > > 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]; > > > > > > Is correct to use all antennas on 5GHz when blutooth is enabled? > > > For me, more logical would be limiting to one antenna no matter of band, > > > since antennas are used anyway, only frequencies differ. > > > > > > For rx_ant, we do not check the band, only limit to first one > > > when bluetooth is used. > > > > there is no BT coex if 5GHz is used because there is not interference > > between 2.4 and 5GHz, so both antenna can be used. WiFi should operated > > in normal condition. > > > > For 2.4GHz, we also can use both antenna if there is not high traffic > > load on BT side. > > > > but you have a good catch, driver need to check band before use it > > (scan_tx_antenna[band]) > > So how about this patch (rfc only): > > From 26d0570ed5cd85097702d0fedb2c3f831dce9714 Mon Sep 17 00:00:00 2001 > From: Stanislaw Gruszka <sgruszka@redhat.com> > Date: Wed, 22 Dec 2010 13:03:31 +0100 > Subject: [RFC PATCH] 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> > --- > drivers/net/wireless/iwlwifi/iwl-6000.c | 7 +------ > drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 9 +++------ > drivers/net/wireless/iwlwifi/iwl-core.h | 1 - > 3 files changed, 4 insertions(+), 13 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c > index f4bec32..af505bc 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", > diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c > index 4bc82fc..322a2bd 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c > +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c > @@ -1492,15 +1492,12 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) > if (priv->cfg->scan_rx_antennas[band]) > rx_ant = priv->cfg->scan_rx_antennas[band]; > > - if (priv->cfg->scan_tx_antennas[band]) > - scan_tx_antennas = priv->cfg->scan_tx_antennas[band]; > - > - if (priv->cfg->bt_params && > + if (band == IEEE80211_BAND_2GHZ && > + priv->cfg->bt_params && > 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); > } Please remove the checking for priv->bt_full_concurrent, so the checking will apply to all scan request if BT coex is there. otherwise, the patch looks ok thanks Wey ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-12-22 17:06 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-12-20 17:05 [PATCH] iwlagn: fix scan tx antenna setting on 5Ghz band Stanislaw Gruszka 2010-12-20 18:13 ` Guy, Wey-Yi 2010-12-21 12:05 ` Stanislaw Gruszka 2010-12-21 17:21 ` Guy, Wey-Yi 2010-12-22 13:15 ` Stanislaw Gruszka 2010-12-22 16:57 ` Guy, Wey-Yi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).