diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-09-19 02:20:24 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-09-19 02:20:24 -0400 |
commit | 2ad4814fb6ddc78ec17079b5dec9e2cd313a944c (patch) | |
tree | 3cfd67ac49b10864c3ed2a3ab970e0c964913fab /net/mac80211 | |
parent | ed44a951c72ab409f932b1c15914488308e86da2 (diff) |
mac80211: make reset debugfs depend on CONFIG_PM
The suspend/resume code depends on CONFIG_PM, so
the reset debugfs file can only be made available
if that is enabled.
Fengguang Wu's zero-day build testing found this.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/debugfs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c index 97173f8144d4..466f4b45dd94 100644 --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c | |||
@@ -70,6 +70,7 @@ DEBUGFS_READONLY_FILE(wep_iv, "%#08x", | |||
70 | DEBUGFS_READONLY_FILE(rate_ctrl_alg, "%s", | 70 | DEBUGFS_READONLY_FILE(rate_ctrl_alg, "%s", |
71 | local->rate_ctrl ? local->rate_ctrl->ops->name : "hw/driver"); | 71 | local->rate_ctrl ? local->rate_ctrl->ops->name : "hw/driver"); |
72 | 72 | ||
73 | #ifdef CONFIG_PM | ||
73 | static ssize_t reset_write(struct file *file, const char __user *user_buf, | 74 | static ssize_t reset_write(struct file *file, const char __user *user_buf, |
74 | size_t count, loff_t *ppos) | 75 | size_t count, loff_t *ppos) |
75 | { | 76 | { |
@@ -88,6 +89,7 @@ static const struct file_operations reset_ops = { | |||
88 | .open = simple_open, | 89 | .open = simple_open, |
89 | .llseek = noop_llseek, | 90 | .llseek = noop_llseek, |
90 | }; | 91 | }; |
92 | #endif | ||
91 | 93 | ||
92 | static ssize_t hwflags_read(struct file *file, char __user *user_buf, | 94 | static ssize_t hwflags_read(struct file *file, char __user *user_buf, |
93 | size_t count, loff_t *ppos) | 95 | size_t count, loff_t *ppos) |
@@ -245,7 +247,9 @@ void debugfs_hw_add(struct ieee80211_local *local) | |||
245 | DEBUGFS_ADD(total_ps_buffered); | 247 | DEBUGFS_ADD(total_ps_buffered); |
246 | DEBUGFS_ADD(wep_iv); | 248 | DEBUGFS_ADD(wep_iv); |
247 | DEBUGFS_ADD(queues); | 249 | DEBUGFS_ADD(queues); |
250 | #ifdef CONFIG_PM | ||
248 | DEBUGFS_ADD_MODE(reset, 0200); | 251 | DEBUGFS_ADD_MODE(reset, 0200); |
252 | #endif | ||
249 | DEBUGFS_ADD(hwflags); | 253 | DEBUGFS_ADD(hwflags); |
250 | DEBUGFS_ADD(user_power); | 254 | DEBUGFS_ADD(user_power); |
251 | DEBUGFS_ADD(power); | 255 | DEBUGFS_ADD(power); |