diff mbox

[3.11,005/137] iwlwifi: dvm: don't enable CTS to self

Message ID 1408354398-10226-6-git-send-email-luis.henriques@canonical.com
State New
Headers show

Commit Message

Luis Henriques Aug. 18, 2014, 9:31 a.m. UTC 
3.11.10.15 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

commit 43d826ca5979927131685cc2092c7ce862cb91cd upstream.

We should always prefer to use full RTS protection. Using
CTS to self gives a meaningless improvement, but this flow
is much harder for the firmware which is likely to have
issues with it.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ------------
 1 file changed, 12 deletions(-)

Comments

Grumbach, Emmanuel Aug. 31, 2014, 12:04 p.m. UTC | #1 
> -----Original Message-----
> From: Luis Henriques [mailto:luis.henriques@canonical.com]
> Sent: Monday, August 18, 2014 12:31 PM
> To: linux-kernel@vger.kernel.org; stable@vger.kernel.org; kernel-
> team@lists.ubuntu.com
> Cc: Grumbach, Emmanuel; Luis Henriques
> Subject: [PATCH 3.11 005/137] iwlwifi: dvm: don't enable CTS to self
> 
> 3.11.10.15 -stable review patch.  If anyone has any objections, please let me
> know.

Just came back from a long travel - please drop this one. It has caused trouble to people.
I need to revert it.

> 
> ------------------
> 
> From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
> 
> commit 43d826ca5979927131685cc2092c7ce862cb91cd upstream.
> 
> We should always prefer to use full RTS protection. Using CTS to self gives a
> meaningless improvement, but this flow is much harder for the firmware
> which is likely to have issues with it.
> 
> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
> Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
> ---
>  drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ------------
>  1 file changed, 12 deletions(-)
> 
> diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c
> b/drivers/net/wireless/iwlwifi/dvm/rxon.c
> index cd1ad0019185..ca17e4c9eca2 100644
> --- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
> +++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
> @@ -1072,13 +1072,6 @@ int iwlagn_commit_rxon(struct iwl_priv *priv,
> struct iwl_rxon_context *ctx)
>  	/* recalculate basic rates */
>  	iwl_calc_basic_rates(priv, ctx);
> 
> -	/*
> -	 * force CTS-to-self frames protection if RTS-CTS is not preferred
> -	 * one aggregation protection method
> -	 */
> -	if (!priv->hw_params.use_rts_for_aggregation)
> -		ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
> -
>  	if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) ||
>  	    !(ctx->staging.flags & RXON_FLG_BAND_24G_MSK))
>  		ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK; @@ -
> 1484,11 +1477,6 @@ void iwlagn_bss_info_changed(struct ieee80211_hw
> *hw,
>  	else
>  		ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
> 
> -	if (bss_conf->use_cts_prot)
> -		ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
> -	else
> -		ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;
> -
>  	memcpy(ctx->staging.bssid_addr, bss_conf->bssid, ETH_ALEN);
> 
>  	if (vif->type == NL80211_IFTYPE_AP ||
> --
> 1.9.1
Luis Henriques Sept. 1, 2014, 8:46 a.m. UTC | #2 
On Sun, Aug 31, 2014 at 12:04:19PM +0000, Grumbach, Emmanuel wrote:
> > -----Original Message-----
> > From: Luis Henriques [mailto:luis.henriques@canonical.com]
> > Sent: Monday, August 18, 2014 12:31 PM
> > To: linux-kernel@vger.kernel.org; stable@vger.kernel.org; kernel-
> > team@lists.ubuntu.com
> > Cc: Grumbach, Emmanuel; Luis Henriques
> > Subject: [PATCH 3.11 005/137] iwlwifi: dvm: don't enable CTS to self
> > 
> > 3.11.10.15 -stable review patch.  If anyone has any objections, please let me
> > know.
> 
> Just came back from a long travel - please drop this one. It has caused trouble to people.
> I need to revert it.
> 

Thank you for your feedback, Emmanuel.

Unfortunately, this kernel has been released already and no more
updates are foreseen to the 3.11 extended kernel -- this was its last
release.

Cheers,
--
Luís

> > 
> > ------------------
> > 
> > From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
> > 
> > commit 43d826ca5979927131685cc2092c7ce862cb91cd upstream.
> > 
> > We should always prefer to use full RTS protection. Using CTS to self gives a
> > meaningless improvement, but this flow is much harder for the firmware
> > which is likely to have issues with it.
> > 
> > Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
> > Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
> > ---
> >  drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ------------
> >  1 file changed, 12 deletions(-)
> > 
> > diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c
> > b/drivers/net/wireless/iwlwifi/dvm/rxon.c
> > index cd1ad0019185..ca17e4c9eca2 100644
> > --- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
> > +++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
> > @@ -1072,13 +1072,6 @@ int iwlagn_commit_rxon(struct iwl_priv *priv,
> > struct iwl_rxon_context *ctx)
> >  	/* recalculate basic rates */
> >  	iwl_calc_basic_rates(priv, ctx);
> > 
> > -	/*
> > -	 * force CTS-to-self frames protection if RTS-CTS is not preferred
> > -	 * one aggregation protection method
> > -	 */
> > -	if (!priv->hw_params.use_rts_for_aggregation)
> > -		ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
> > -
> >  	if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) ||
> >  	    !(ctx->staging.flags & RXON_FLG_BAND_24G_MSK))
> >  		ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK; @@ -
> > 1484,11 +1477,6 @@ void iwlagn_bss_info_changed(struct ieee80211_hw
> > *hw,
> >  	else
> >  		ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
> > 
> > -	if (bss_conf->use_cts_prot)
> > -		ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
> > -	else
> > -		ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;
> > -
> >  	memcpy(ctx->staging.bssid_addr, bss_conf->bssid, ETH_ALEN);
> > 
> >  	if (vif->type == NL80211_IFTYPE_AP ||
> > --
> > 1.9.1
>
Grumbach, Emmanuel Sept. 1, 2014, 8:50 a.m. UTC | #3 
> 
> On Sun, Aug 31, 2014 at 12:04:19PM +0000, Grumbach, Emmanuel wrote:
> > > -----Original Message-----
> > > From: Luis Henriques [mailto:luis.henriques@canonical.com]
> > > Sent: Monday, August 18, 2014 12:31 PM
> > > To: linux-kernel@vger.kernel.org; stable@vger.kernel.org; kernel-
> > > team@lists.ubuntu.com
> > > Cc: Grumbach, Emmanuel; Luis Henriques
> > > Subject: [PATCH 3.11 005/137] iwlwifi: dvm: don't enable CTS to self
> > >
> > > 3.11.10.15 -stable review patch.  If anyone has any objections,
> > > please let me know.
> >
> > Just came back from a long travel - please drop this one. It has caused
> trouble to people.
> > I need to revert it.
> >
> 
> Thank you for your feedback, Emmanuel.
> 
> Unfortunately, this kernel has been released already and no more updates
> are foreseen to the 3.11 extended kernel -- this was its last release.
> 

Ok -  I just pushed the revert to my tree and sent a pull request.

> Cheers,
> --
> Luís
> 
> > >
> > > ------------------
> > >
> > > From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
> > >
> > > commit 43d826ca5979927131685cc2092c7ce862cb91cd upstream.
> > >
> > > We should always prefer to use full RTS protection. Using CTS to
> > > self gives a meaningless improvement, but this flow is much harder
> > > for the firmware which is likely to have issues with it.
> > >
> > > Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
> > > Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
> > > ---
> > >  drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ------------
> > >  1 file changed, 12 deletions(-)
> > >
> > > diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c
> > > b/drivers/net/wireless/iwlwifi/dvm/rxon.c
> > > index cd1ad0019185..ca17e4c9eca2 100644
> > > --- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
> > > +++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
> > > @@ -1072,13 +1072,6 @@ int iwlagn_commit_rxon(struct iwl_priv *priv,
> > > struct iwl_rxon_context *ctx)
> > >  	/* recalculate basic rates */
> > >  	iwl_calc_basic_rates(priv, ctx);
> > >
> > > -	/*
> > > -	 * force CTS-to-self frames protection if RTS-CTS is not preferred
> > > -	 * one aggregation protection method
> > > -	 */
> > > -	if (!priv->hw_params.use_rts_for_aggregation)
> > > -		ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
> > > -
> > >  	if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) ||
> > >  	    !(ctx->staging.flags & RXON_FLG_BAND_24G_MSK))
> > >  		ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK; @@ -
> > > 1484,11 +1477,6 @@ void iwlagn_bss_info_changed(struct ieee80211_hw
> > > *hw,
> > >  	else
> > >  		ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
> > >
> > > -	if (bss_conf->use_cts_prot)
> > > -		ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
> > > -	else
> > > -		ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;
> > > -
> > >  	memcpy(ctx->staging.bssid_addr, bss_conf->bssid, ETH_ALEN);
> > >
> > >  	if (vif->type == NL80211_IFTYPE_AP ||
> > > --
> > > 1.9.1
> >
diff mbox

Patch

diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c
index cd1ad0019185..ca17e4c9eca2 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
@@ -1072,13 +1072,6 @@  int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
 	/* recalculate basic rates */
 	iwl_calc_basic_rates(priv, ctx);
 
-	/*
-	 * force CTS-to-self frames protection if RTS-CTS is not preferred
-	 * one aggregation protection method
-	 */
-	if (!priv->hw_params.use_rts_for_aggregation)
-		ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
-
 	if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) ||
 	    !(ctx->staging.flags & RXON_FLG_BAND_24G_MSK))
 		ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
@@ -1484,11 +1477,6 @@  void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
 	else
 		ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
 
-	if (bss_conf->use_cts_prot)
-		ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
-	else
-		ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;
-
 	memcpy(ctx->staging.bssid_addr, bss_conf->bssid, ETH_ALEN);
 
 	if (vif->type == NL80211_IFTYPE_AP ||