|
@@ -2100,14 +2100,14 @@ void reg_device_remove(struct wiphy *wiphy)
|
|
|
|
|
|
assert_cfg80211_lock();
|
|
assert_cfg80211_lock();
|
|
|
|
|
|
|
|
+ kfree(wiphy->regd);
|
|
|
|
+
|
|
if (last_request)
|
|
if (last_request)
|
|
request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
|
|
request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
|
|
|
|
|
|
- kfree(wiphy->regd);
|
|
|
|
- if (!last_request || !request_wiphy)
|
|
|
|
- return;
|
|
|
|
- if (request_wiphy != wiphy)
|
|
|
|
|
|
+ if (!request_wiphy || request_wiphy != wiphy)
|
|
return;
|
|
return;
|
|
|
|
+
|
|
last_request->wiphy_idx = WIPHY_IDX_STALE;
|
|
last_request->wiphy_idx = WIPHY_IDX_STALE;
|
|
last_request->country_ie_env = ENVIRON_ANY;
|
|
last_request->country_ie_env = ENVIRON_ANY;
|
|
}
|
|
}
|