diff options
author | Dan Carpenter <error27@gmail.com> | 2010-07-22 07:26:50 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-07-26 15:32:41 -0400 |
commit | f9f9b6e3e3128e2b4d01a6e5ed0bb73cbb9a0a37 (patch) | |
tree | 8fdd35bd43152eeccc77915e0f9452f50eb0e479 /net/wireless/reg.c | |
parent | 7e988014cd6dec991f095305256f57168b5610e8 (diff) |
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/wireless/reg.c')
-rw-r--r-- | net/wireless/reg.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 48baf28cc4b6..ec4e76f95044 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
@@ -1492,7 +1492,6 @@ void regulatory_hint_11d(struct wiphy *wiphy, | |||
1492 | u8 *country_ie, | 1492 | u8 *country_ie, |
1493 | u8 country_ie_len) | 1493 | u8 country_ie_len) |
1494 | { | 1494 | { |
1495 | struct ieee80211_regdomain *rd = NULL; | ||
1496 | char alpha2[2]; | 1495 | char alpha2[2]; |
1497 | enum environment_cap env = ENVIRON_ANY; | 1496 | enum environment_cap env = ENVIRON_ANY; |
1498 | struct regulatory_request *request; | 1497 | struct regulatory_request *request; |
@@ -1529,7 +1528,7 @@ void regulatory_hint_11d(struct wiphy *wiphy, | |||
1529 | 1528 | ||
1530 | request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL); | 1529 | request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL); |
1531 | if (!request) | 1530 | if (!request) |
1532 | goto free_rd_out; | 1531 | goto out; |
1533 | 1532 | ||
1534 | request->wiphy_idx = get_wiphy_idx(wiphy); | 1533 | request->wiphy_idx = get_wiphy_idx(wiphy); |
1535 | request->alpha2[0] = alpha2[0]; | 1534 | request->alpha2[0] = alpha2[0]; |
@@ -1543,8 +1542,6 @@ void regulatory_hint_11d(struct wiphy *wiphy, | |||
1543 | 1542 | ||
1544 | return; | 1543 | return; |
1545 | 1544 | ||
1546 | free_rd_out: | ||
1547 | kfree(rd); | ||
1548 | out: | 1545 | out: |
1549 | mutex_unlock(®_mutex); | 1546 | mutex_unlock(®_mutex); |
1550 | } | 1547 | } |