wireless: remove unreachable code

Commit Message

Joe Perches Sept. 17, 2012, 2:43 p.m. UTC

On Mon, 2012-09-17 at 11:54 +0100, Alan Cox wrote:
> From: Alan Cox <[e-mail]>
> 
> The only case where intersected_rd can become non NULL is within an if. All
> paths from that if return, so the end chunk has therefore squawked its
> last and is no more.

It might be better to move the declaration into the if brace too
---
 net/wireless/reg.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)




--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 1ad04e5..7985ab2 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2192,7 +2192,6 @@  static void print_regdomain_info(const struct ieee80211_regdomain *rd)
 /* Takes ownership of rd only if it doesn't fail */
 static int __set_regdom(const struct ieee80211_regdomain *rd)
 {
-	const struct ieee80211_regdomain *intersected_rd = NULL;
 	struct cfg80211_registered_device *rdev = NULL;
 	struct wiphy *request_wiphy;
 	/* Some basic sanity checks first */
@@ -2282,6 +2281,7 @@  static int __set_regdom(const struct ieee80211_regdomain *rd)
 	/* Intersection requires a bit more work */
 
 	if (last_request->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
+		const struct ieee80211_regdomain *intersected_rd;
 
 		intersected_rd = regdom_intersect(rd, cfg80211_regdomain);
 		if (!intersected_rd)