diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-05-05 19:48:47 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-10 15:54:44 -0400 |
commit | 38bb3e9da62f6ebf1c6940d5482f0d6f431dac1c (patch) | |
tree | 7d63768b147b3bcc3865a923a4c23dfad14b1483 | |
parent | 3782cf4a04c272bdaa8476463b1d0208edbc505d (diff) |
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>
-rw-r--r-- | net/mac80211/main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index cb326d36be9c..ab1f464817af 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
@@ -696,8 +696,11 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) | |||
696 | WLAN_CIPHER_SUITE_AES_CMAC | 696 | WLAN_CIPHER_SUITE_AES_CMAC |
697 | }; | 697 | }; |
698 | 698 | ||
699 | if ((hw->wiphy->wowlan.flags || hw->wiphy->wowlan.n_patterns) && | 699 | if ((hw->wiphy->wowlan.flags || hw->wiphy->wowlan.n_patterns) |
700 | (!local->ops->suspend || !local->ops->resume)) | 700 | #ifdef CONFIG_PM |
701 | && (!local->ops->suspend || !local->ops->resume) | ||
702 | #endif | ||
703 | ) | ||
701 | return -EINVAL; | 704 | return -EINVAL; |
702 | 705 | ||
703 | if (hw->max_report_rates == 0) | 706 | if (hw->max_report_rates == 0) |