aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2010-03-12 14:13:26 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-03-30 15:37:29 -0400
commitf6c8f1523a2de3b84340e45913cbcee8bee74570 (patch)
tree540894961e066006c912f270de2861eb7ec90be5
parent7236fe29fd72d17074574ba312e7f1bb9d10abaa (diff)
iwlwifi: fix regulatory
Commit "cfg80211: convert bools into flags" mistakenly modified iwlwifi's regulatory settings instead of just converting it. Fix this. This fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2172 Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> CC: stable@kernel.org
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 818367b57bab..c8e2e3a42b4b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2644,7 +2644,7 @@ static int iwl_mac_setup_register(struct iwl_priv *priv)
2644 BIT(NL80211_IFTYPE_STATION) | 2644 BIT(NL80211_IFTYPE_STATION) |
2645 BIT(NL80211_IFTYPE_ADHOC); 2645 BIT(NL80211_IFTYPE_ADHOC);
2646 2646
2647 hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY | 2647 hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
2648 WIPHY_FLAG_DISABLE_BEACON_HINTS; 2648 WIPHY_FLAG_DISABLE_BEACON_HINTS;
2649 2649
2650 /* 2650 /*
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 54daa38ecba3..f93013e9b17d 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -3921,7 +3921,7 @@ static int iwl3945_setup_mac(struct iwl_priv *priv)
3921 BIT(NL80211_IFTYPE_STATION) | 3921 BIT(NL80211_IFTYPE_STATION) |
3922 BIT(NL80211_IFTYPE_ADHOC); 3922 BIT(NL80211_IFTYPE_ADHOC);
3923 3923
3924 hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY | 3924 hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
3925 WIPHY_FLAG_DISABLE_BEACON_HINTS; 3925 WIPHY_FLAG_DISABLE_BEACON_HINTS;
3926 3926
3927 hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945; 3927 hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945;