From: Vincent Zweije <vincent@zweije.nl>
Date: Tue, 7 Jun 2011 14:37:09 +0000 (+0200)
Subject: networking: fix warning about unused label wake_up
X-Git-Tag: MMI-PSA29.97-13-9~18350^2~12^2~42^2~451
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=43a1c2721acd792aea370ee68ef054e18c944373;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

networking: fix warning about unused label wake_up

Function ieee80211_reconfig in net/mac80211/util.c contains label wake_up
which is defined unconditionally, but only used with CONFIG_PM. Gcc
warns about this when CONFIG_PM is not defined.

This patch makes the label's definition dependent on CONFIG_PM too,
eliminating the warning.

The issue was apparently introduced in git commit
eecc48000afe2ca6da22122d553b7cad294e42fc.

Signed-off-by: Vincent Zweije <vincent@zweije.nl>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index d3fe2d237485..05e3fb889d77 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1276,7 +1276,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 		if (ieee80211_sdata_running(sdata))
 			ieee80211_enable_keys(sdata);
 
+#ifdef CONFIG_PM
  wake_up:
+#endif
 	ieee80211_wake_queues_by_reason(hw,
 			IEEE80211_QUEUE_STOP_REASON_SUSPEND);