cfg80211: remove superfluous !last_request check in reg_device_remove()
PATCH 1/1 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 <[email protected]>
--- net/wireless/reg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
net/wireless/reg.c +4 -4
@@ -2099,14 +2099,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 ; }