--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
-@@ -1805,6 +1805,8 @@ void regulatory_hint_11d(struct wiphy *w
+@@ -1696,6 +1696,8 @@ void regulatory_hint_11d(struct wiphy *w
enum environment_cap env = ENVIRON_ANY;
- struct regulatory_request *request;
+ struct regulatory_request *request = NULL, *lr;
+ return;
+
- mutex_lock(®_mutex);
-
- if (unlikely(!last_request))
-@@ -2039,6 +2041,8 @@ static void restore_regulatory_settings(
+ /* IE len must be evenly divisible by 2 */
+ if (country_ie_len & 0x01)
+ return;
+@@ -1890,6 +1892,7 @@ static void restore_regulatory_settings(
void regulatory_hint_disconnect(void)
{
+ return;
-+
- REG_DBG_PRINT("All devices are disconnected, going to "
- "restore regulatory settings\n");
+ REG_DBG_PRINT("All devices are disconnected, going to restore regulatory settings\n");
restore_regulatory_settings(false);
+ }