]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
wireless: remove unneeded variable from regulatory_hint_11d()
authorDan Carpenter <error27@gmail.com>
Thu, 22 Jul 2010 11:26:50 +0000 (13:26 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 26 Jul 2010 19:32:41 +0000 (15:32 -0400)
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>
net/wireless/reg.c

index 48baf28cc4b68608a93b22e08dcf579cebc94afa..ec4e76f95044b0af920b07d64f045d8a4e310f6c 100644 (file)
@@ -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);
 }