diff options
author | Reinette Chatre | 2010-03-12 20:13:26 +0100 |
---|---|---|
committer | John W. Linville | 2010-03-30 21:37:29 +0200 |
commit | f6c8f1523a2de3b84340e45913cbcee8bee74570 (patch) | |
tree | 540894961e066006c912f270de2861eb7ec90be5 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | mac80211: move netdev queue enabling to correct spot (diff) | |
download | kernel-qcow2-linux-f6c8f1523a2de3b84340e45913cbcee8bee74570.tar.gz kernel-qcow2-linux-f6c8f1523a2de3b84340e45913cbcee8bee74570.tar.xz kernel-qcow2-linux-f6c8f1523a2de3b84340e45913cbcee8bee74570.zip |
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
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 |
1 files changed, 1 insertions, 1 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) BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC); - hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY | + hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS; /* |