aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wright <chrisw@sous-sol.org>2009-04-24 14:09:31 -0700
committerJohn W. Linville <linville@tuxdriver.com>2009-05-06 15:14:40 -0400
commit0ef9ccdd9ec7f2cf28d0605c216d853687f5291d (patch)
tree0056421d720d214ba49452d481325ce8156109e7
parent2cfb1f5e20f260e6ff306ba181efee956ba48f54 (diff)
downloadkernel_samsung_smdk4412-0ef9ccdd9ec7f2cf28d0605c216d853687f5291d.zip
kernel_samsung_smdk4412-0ef9ccdd9ec7f2cf28d0605c216d853687f5291d.tar.gz
kernel_samsung_smdk4412-0ef9ccdd9ec7f2cf28d0605c216d853687f5291d.tar.bz2
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>
-rw-r--r--net/wireless/reg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index f38cc39..9fea910 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2100,14 +2100,14 @@ void reg_device_remove(struct wiphy *wiphy)
assert_cfg80211_lock();
+ kfree(wiphy->regd);
+
if (last_request)
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;
+
last_request->wiphy_idx = WIPHY_IDX_STALE;
last_request->country_ie_env = ENVIRON_ANY;
}