diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index cdc07c47745..a3739628c1d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -115,9 +115,6 @@ int iwl_commit_rxon(struct iwl_priv *priv) | |||
115 | 115 | ||
116 | /* always get timestamp with Rx frame */ | 116 | /* always get timestamp with Rx frame */ |
117 | priv->staging_rxon.flags |= RXON_FLG_TSF2HOST_MSK; | 117 | priv->staging_rxon.flags |= RXON_FLG_TSF2HOST_MSK; |
118 | /* allow CTS-to-self if possible. this is relevant only for | ||
119 | * 5000, but will not damage 4965 */ | ||
120 | priv->staging_rxon.flags |= RXON_FLG_SELF_CTS_EN; | ||
121 | 118 | ||
122 | ret = iwl_check_rxon_cmd(priv); | 119 | ret = iwl_check_rxon_cmd(priv); |
123 | if (ret) { | 120 | if (ret) { |
@@ -217,6 +214,13 @@ int iwl_commit_rxon(struct iwl_priv *priv) | |||
217 | "Could not send WEP static key.\n"); | 214 | "Could not send WEP static key.\n"); |
218 | } | 215 | } |
219 | 216 | ||
217 | /* | ||
218 | * allow CTS-to-self if possible for new association. | ||
219 | * this is relevant only for 5000 series and up, | ||
220 | * but will not damage 4965 | ||
221 | */ | ||
222 | priv->staging_rxon.flags |= RXON_FLG_SELF_CTS_EN; | ||
223 | |||
220 | /* Apply the new configuration | 224 | /* Apply the new configuration |
221 | * RXON assoc doesn't clear the station table in uCode, | 225 | * RXON assoc doesn't clear the station table in uCode, |
222 | */ | 226 | */ |