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
This commit is contained in:
parent
7236fe29fd
commit
f6c8f1523a
2 changed files with 2 additions and 2 deletions
|
@ -2644,7 +2644,7 @@ static int iwl_mac_setup_register(struct iwl_priv *priv)
|
||||||
BIT(NL80211_IFTYPE_STATION) |
|
BIT(NL80211_IFTYPE_STATION) |
|
||||||
BIT(NL80211_IFTYPE_ADHOC);
|
BIT(NL80211_IFTYPE_ADHOC);
|
||||||
|
|
||||||
hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY |
|
hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
|
||||||
WIPHY_FLAG_DISABLE_BEACON_HINTS;
|
WIPHY_FLAG_DISABLE_BEACON_HINTS;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -3921,7 +3921,7 @@ static int iwl3945_setup_mac(struct iwl_priv *priv)
|
||||||
BIT(NL80211_IFTYPE_STATION) |
|
BIT(NL80211_IFTYPE_STATION) |
|
||||||
BIT(NL80211_IFTYPE_ADHOC);
|
BIT(NL80211_IFTYPE_ADHOC);
|
||||||
|
|
||||||
hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY |
|
hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
|
||||||
WIPHY_FLAG_DISABLE_BEACON_HINTS;
|
WIPHY_FLAG_DISABLE_BEACON_HINTS;
|
||||||
|
|
||||||
hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945;
|
hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945;
|
||||||
|
|
Reference in a new issue