p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cfg80211: reg: remove useless reg_timeout scheduling 

When the functions reg_set_rd_driver() and reg_set_rd_country_ie()
return with an error, the calling function already restores data
by calling restore_regulatory_settings(), so there's no need to
also schedule a timeout (which would lead to other side effects
such as indicating CRDA failed, which clearly isn't true.) Remove
the scheduling.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2015-10-15 09:12:49 +02:00
parent c7d319e542
commit 922ec58c70
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/wireless/reg.c
View File

@ -2884,11 +2884,8 @@ static int reg_set_rd_driver(const struct ieee80211_regdomain *rd,
} }
request_wiphy = wiphy_idx_to_wiphy(driver_request->wiphy_idx); request_wiphy = wiphy_idx_to_wiphy(driver_request->wiphy_idx);
if (!request_wiphy) { if (!request_wiphy)
queue_delayed_work(system_power_efficient_wq,
&reg_timeout, 0);
return -ENODEV; return -ENODEV;
}
if (!driver_request->intersect) { if (!driver_request->intersect) {
if (request_wiphy->regd) if (request_wiphy->regd)
@ -2945,11 +2942,8 @@ static int reg_set_rd_country_ie(const struct ieee80211_regdomain *rd,
} }
request_wiphy = wiphy_idx_to_wiphy(country_ie_request->wiphy_idx); request_wiphy = wiphy_idx_to_wiphy(country_ie_request->wiphy_idx);
if (!request_wiphy) { if (!request_wiphy)
queue_delayed_work(system_power_efficient_wq,
&reg_timeout, 0);
return -ENODEV; return -ENODEV;
}
if (country_ie_request->intersect) if (country_ie_request->intersect)
return -EINVAL; return -EINVAL;