From f9f9b6e3e3128e2b4d01a6e5ed0bb73cbb9a0a37 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 22 Jul 2010 13:26:50 +0200 Subject: [PATCH] wireless: remove unneeded variable from regulatory_hint_11d() The "rd" variable isn't needed any more since 4f366c5dabcb "wireless: only use alpha2 regulatory information from country IE" Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville --- net/wireless/reg.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 48baf28cc4b..ec4e76f9504 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1492,7 +1492,6 @@ void regulatory_hint_11d(struct wiphy *wiphy, u8 *country_ie, u8 country_ie_len) { - struct ieee80211_regdomain *rd = NULL; char alpha2[2]; enum environment_cap env = ENVIRON_ANY; struct regulatory_request *request; @@ -1529,7 +1528,7 @@ void regulatory_hint_11d(struct wiphy *wiphy, request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL); if (!request) - goto free_rd_out; + goto out; request->wiphy_idx = get_wiphy_idx(wiphy); request->alpha2[0] = alpha2[0]; @@ -1543,8 +1542,6 @@ void regulatory_hint_11d(struct wiphy *wiphy, return; -free_rd_out: - kfree(rd); out: mutex_unlock(®_mutex); } -- 2.39.3