OSDN Git Service

cfg80211: amend regulatory NULL dereference fix
authorLuis R. Rodriguez <mcgrof@qca.qualcomm.com>
Mon, 28 Nov 2011 21:47:16 +0000 (16:47 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Nov 2011 19:16:33 +0000 (14:16 -0500)
commit0bac71af6e66dc798bf07d0c0dd14ee5503362f9
tree3a30fb610fd45c531acf4c5e955656787f9016e0
parenta042994dd377d86bff9446ee76151ceb6267c9ba
cfg80211: amend regulatory NULL dereference fix

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: stable@vger.kernel.org
Cc: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/wireless/reg.c