commit 38bb3e9da62f6ebf1c6940d5482f0d6f431dac1c
author Larry Finger <Larry.Finger@lwfinger.net> Thu May 05 18:48:47 2011 -0500
committer John W. Linville <linville@tuxdriver.com> Tue May 10 15:54:44 2011 -0400
tree 7d63768b147b3bcc3865a923a4c23dfad14b1483
parent 3782cf4a04c272bdaa8476463b1d0208edbc505d

mac80211: Fix build error when CONFIG_PM is not defined

When mac80211 is built without CONFIG_PM being defined, the following errors
are output:

net/mac80211/main.c: In function ‘ieee80211_register_hw’:
net/mac80211/main.c:700: error: ‘const struct ieee80211_ops’ has no member named ‘suspend’
net/mac80211/main.c:700: error: ‘const struct ieee80211_ops’ has no member named ‘resume’
make[2]: *** [net/mac80211/main.o] Error 1
make[1]: *** [net/mac80211] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [net] Error 2

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

net/mac80211/main.c

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index cb326d3..ab1f464 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -696,8 +696,11 @@
 		WLAN_CIPHER_SUITE_AES_CMAC
 	};
 
-	if ((hw->wiphy->wowlan.flags || hw->wiphy->wowlan.n_patterns) &&
-	    (!local->ops->suspend || !local->ops->resume))
+	if ((hw->wiphy->wowlan.flags || hw->wiphy->wowlan.n_patterns)
+#ifdef CONFIG_PM
+	    && (!local->ops->suspend || !local->ops->resume)
+#endif
+	    )
 		return -EINVAL;
 
 	if (hw->max_report_rates == 0)