Commit 0ef9ccdd authored Apr 24, 2009 by Chris Wright Committed by John W. Linville May 06, 2009

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>

parent 2cfb1f5e

net/wireless/reg.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}