diff options
| author | Zhu Yi <yi.zhu@intel.com> | 2007-11-11 22:37:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:04:39 -0500 |
| commit | 797a54c68e0eb551c60e3dc843627f967919a951 (patch) | |
| tree | 04c57351356aa248a7d5b42c4d1f63c5435e12c1 | |
| parent | 7223e8d900d415fe128152d7a4061501b7593d37 (diff) | |
iwl4965: fix rxon flags set to wrong value for A mode in .erp_ie_changed
The patch fixes a bug that enables RXON_FLG_TGG_PROTECT_MSK erroneously
for A mode in the erp_ie_changed mac80211 callback.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 7d0b7c994d98..24dc40f2f4c8 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
| @@ -7674,7 +7674,7 @@ static void iwl4965_mac_erp_ie_changed(struct ieee80211_hw *hw, | |||
| 7674 | } | 7674 | } |
| 7675 | 7675 | ||
| 7676 | if (changes & IEEE80211_ERP_CHANGE_PROTECTION) { | 7676 | if (changes & IEEE80211_ERP_CHANGE_PROTECTION) { |
| 7677 | if (cts_protection) | 7677 | if (cts_protection && (priv->phymode != MODE_IEEE80211A)) |
| 7678 | priv->staging_rxon.flags |= RXON_FLG_TGG_PROTECT_MSK; | 7678 | priv->staging_rxon.flags |= RXON_FLG_TGG_PROTECT_MSK; |
| 7679 | else | 7679 | else |
| 7680 | priv->staging_rxon.flags &= ~RXON_FLG_TGG_PROTECT_MSK; | 7680 | priv->staging_rxon.flags &= ~RXON_FLG_TGG_PROTECT_MSK; |