summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorVincent Zweije <vincent@zweije.nl>2011-06-07 16:37:09 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-06-10 14:26:51 -0400
commit43a1c2721acd792aea370ee68ef054e18c944373 (patch)
treebb347efede3ae836662fbe1b27ee9373685fd2d6 /net/mac80211
parent323222b5ff930a43eab45cec6e58345740fa2a29 (diff)
downloadop-kernel-dev-43a1c2721acd792aea370ee68ef054e18c944373.zip
op-kernel-dev-43a1c2721acd792aea370ee68ef054e18c944373.tar.gz
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/util.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index d3fe2d2..05e3fb8 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);
OpenPOWER on IntegriCloud