[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20110607143709.GA16841@love.zweije.nl>
Date: Tue, 7 Jun 2011 16:37:09 +0200
From: Vincent Zweije <vincent@...ije.nl>
To: Johannes Berg <johannes@...solutions.net>
Cc: Linux Wireless <linux-wireless@...r.kernel.org>,
Trivial Patch Monkey <trivial@...nel.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] networking: fix warning about unused label wake_up
From: Vincent Zweije <vincent@...ije.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@...ije.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@...ije.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.
Download attachment "signature.asc" of type "application/pgp-signature" (191 bytes)
Powered by blists - more mailing lists