]> Pileus Git - ~andy/linux/commitdiff
networking: fix warning about unused label wake_up
authorVincent Zweije <vincent@zweije.nl>
Tue, 7 Jun 2011 14:37:09 +0000 (16:37 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Jun 2011 18:26:51 +0000 (14:26 -0400)
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>
net/mac80211/util.c

index d3fe2d2374859566d0c968a949aff2536dadf60d..05e3fb889d772af508153d39c631571b7eebc541 100644 (file)
@@ -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);