* [PATCH] networking: fix warning about unused label wake_up
@ 2011-06-07 14:37 Vincent Zweije
0 siblings, 0 replies; only message in thread
From: Vincent Zweije @ 2011-06-07 14:37 UTC (permalink / raw)
To: Johannes Berg; +Cc: Linux Wireless, Trivial Patch Monkey, LKML
[-- Attachment #1: Type: text/plain, Size: 1200 bytes --]
From: Vincent Zweije <vincent@zweije.nl>
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>
---
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.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 190 bytes --]
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-06-07 14:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-07 14:37 [PATCH] networking: fix warning about unused label wake_up Vincent Zweije
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).