diff options
authorLuis R. Rodriguez <>2011-11-28 16:47:16 -0500
committerGreg Kroah-Hartman <>2011-12-09 08:55:46 -0800
commitaedebb8ae9811dedc3e57757a1048cd8d902fa3a (patch)
parent5b157407b89257481a639b869f0f42532fceafaa (diff)
cfg80211: amend regulatory NULL dereference fix
commit 0bac71af6e66dc798bf07d0c0dd14ee5503362f9 upstream. Johannes' patch for "cfg80211: fix regulatory NULL dereference" broke user regulaotry hints and it did not address the fact that last_request was left populated even if the previous regulatory hint was stale due to the wiphy disappearing. Fix user reguluatory hints by only bailing out if for those regulatory hints where a request_wiphy is expected. The stale last_request considerations are addressed through the previous fixes on last_request where we reset the last_request to a static world regdom request upon reset_regdomains(). In this case though we further enhance the effect by simply restoring reguluatory settings completely. Cc: Johannes Berg <> Signed-off-by: Luis R. Rodriguez <> Reviewed-by: Johannes Berg <> Signed-off-by: John W. Linville <> Signed-off-by: Greg Kroah-Hartman <>
1 files changed, 4 insertions, 2 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 3208e0595401..1bc36d250baf 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2040,8 +2040,10 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
- if (!request_wiphy) {
- reg_set_request_processed();
+ if (!request_wiphy &&
+ (last_request->initiator == NL80211_REGDOM_SET_BY_DRIVER ||
+ last_request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE)) {
+ schedule_delayed_work(&reg_timeout, 0);
return -ENODEV;