Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6c8f152 authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville
Browse files

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: default avatarReinette Chatre <reinette.chatre@intel.com>
CC: stable@kernel.org
parent 7236fe29

drivers/net/wireless/iwlwifi/iwl-agn.c

+1 −1
Original line number Diff line number Diff line
@@ -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;



	/*

drivers/net/wireless/iwlwifi/iwl3945-base.c

+1 −1
Original line number Diff line number Diff line
@@ -3921,7 +3921,7 @@ static int iwl3945_setup_mac(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;



	hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945;