wireless: remove unneeded variable from

PATCH New Dan Carpenter 1 participant 1 message Jul 22, 2010

Subsystems (2)

Kernel janitors 802.11 (including cfg80211/NL80211)

lore

Share & tools

lore

Dan Carpenter

author

2010-07-22 11:26 UTC #0 lore raw

PATCH 1/1 wireless: remove unneeded variable from

The "rd" variable isn't needed any more since 4f366c5dabcb "wireless: only use alpha2 regulatory information from country IE"

Signed-off-by Dan Carpenter <[email protected]>

net/wireless/reg.c +1 -4

index 48baf28..ec4e76f 100644
@@ -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);
 }