DORMANTno replies

[PATCH] networking: fix warning about unused label wake_up

From: Vincent Zweije <hidden>
Date: 2011-06-07 14:43:23
Also in: lkml
Subsystem: mac80211, the rest · Maintainers: Johannes Berg, Linus Torvalds

From: Vincent Zweije <redacted>

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 <redacted>
---
The diff below is against 3.0-rc2.

Thanks.
Vincent.
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);
 
-- 
Vincent Zweije <vincent@zweije.nl>   | "If you're flamed in a group you
<http://www.xs4all.nl/~zweije/>      | don't read, does anybody get burnt?"
[Xhost should be taken out and shot] |            -- Paul Tomblin on a.s.r.

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help