From: Chris Wright <chrisw@sous-sol.org>
Date: Fri, 24 Apr 2009 21:09:31 +0000 (-0700)
Subject: cfg80211: remove superfluous !last_request check in reg_device_remove()
X-Git-Tag: v2.6.31-rc1~14^2~525^2~54
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ef9ccdd9ec7f2cf28d0605c216d853687f5291d;p=profile%2Fivi%2Fkernel-x86-ivi.git

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>
---

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;
 }