openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cfg80211: remove superfluous !last_request check in reg_device_remove() 

Commit 0ad8acaf "cfg80211: fix NULL pointer deference in
reg_device_remove()" added a check that last_request is non-NULL,
rendering the 2nd check superfluous.  While there, rearrange the code a
bit so it's a little more straight forward.

Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Chris Wright 2009-04-24 14:09:31 -07:00 committed by John W. Linville
parent 2cfb1f5e20
commit 0ef9ccdd9e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/wireless/reg.c
View File

@ -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 (!request_wiphy || request_wiphy != wiphy)
if (!last_request || !request_wiphy)
return;
if (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;
} }