summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-07-22 13:26:50 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-07-26 15:32:41 -0400
commitf9f9b6e3e3128e2b4d01a6e5ed0bb73cbb9a0a37 (patch)
tree8fdd35bd43152eeccc77915e0f9452f50eb0e479 /net
parent7e988014cd6dec991f095305256f57168b5610e8 (diff)
downloadlinux-3.10-f9f9b6e3e3128e2b4d01a6e5ed0bb73cbb9a0a37.tar.gz
linux-3.10-f9f9b6e3e3128e2b4d01a6e5ed0bb73cbb9a0a37.tar.bz2
linux-3.10-f9f9b6e3e3128e2b4d01a6e5ed0bb73cbb9a0a37.zip
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 <error27@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/reg.c5
1 files changed, 1 insertions, 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(&reg_mutex);
}