diff options
Diffstat (limited to 'net/wireless/sysfs.c')
-rw-r--r-- | net/wireless/sysfs.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c index 8f28b9f798d8..360a42c6f694 100644 --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c | |||
@@ -91,6 +91,7 @@ static void cfg80211_leave_all(struct cfg80211_registered_device *rdev) | |||
91 | cfg80211_leave(rdev, wdev); | 91 | cfg80211_leave(rdev, wdev); |
92 | } | 92 | } |
93 | 93 | ||
94 | #ifdef CONFIG_PM | ||
94 | static int wiphy_suspend(struct device *dev, pm_message_t state) | 95 | static int wiphy_suspend(struct device *dev, pm_message_t state) |
95 | { | 96 | { |
96 | struct cfg80211_registered_device *rdev = dev_to_rdev(dev); | 97 | struct cfg80211_registered_device *rdev = dev_to_rdev(dev); |
@@ -100,10 +101,10 @@ static int wiphy_suspend(struct device *dev, pm_message_t state) | |||
100 | 101 | ||
101 | rtnl_lock(); | 102 | rtnl_lock(); |
102 | if (rdev->wiphy.registered) { | 103 | if (rdev->wiphy.registered) { |
103 | if (!rdev->wowlan) | 104 | if (!rdev->wiphy.wowlan_config) |
104 | cfg80211_leave_all(rdev); | 105 | cfg80211_leave_all(rdev); |
105 | if (rdev->ops->suspend) | 106 | if (rdev->ops->suspend) |
106 | ret = rdev_suspend(rdev, rdev->wowlan); | 107 | ret = rdev_suspend(rdev, rdev->wiphy.wowlan_config); |
107 | if (ret == 1) { | 108 | if (ret == 1) { |
108 | /* Driver refuse to configure wowlan */ | 109 | /* Driver refuse to configure wowlan */ |
109 | cfg80211_leave_all(rdev); | 110 | cfg80211_leave_all(rdev); |
@@ -132,6 +133,7 @@ static int wiphy_resume(struct device *dev) | |||
132 | 133 | ||
133 | return ret; | 134 | return ret; |
134 | } | 135 | } |
136 | #endif | ||
135 | 137 | ||
136 | static const void *wiphy_namespace(struct device *d) | 138 | static const void *wiphy_namespace(struct device *d) |
137 | { | 139 | { |
@@ -146,8 +148,10 @@ struct class ieee80211_class = { | |||
146 | .dev_release = wiphy_dev_release, | 148 | .dev_release = wiphy_dev_release, |
147 | .dev_attrs = ieee80211_dev_attrs, | 149 | .dev_attrs = ieee80211_dev_attrs, |
148 | .dev_uevent = wiphy_uevent, | 150 | .dev_uevent = wiphy_uevent, |
151 | #ifdef CONFIG_PM | ||
149 | .suspend = wiphy_suspend, | 152 | .suspend = wiphy_suspend, |
150 | .resume = wiphy_resume, | 153 | .resume = wiphy_resume, |
154 | #endif | ||
151 | .ns_type = &net_ns_type_operations, | 155 | .ns_type = &net_ns_type_operations, |
152 | .namespace = wiphy_namespace, | 156 | .namespace = wiphy_namespace, |
153 | }; | 157 | }; |