diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-29 22:54:16 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-29 22:54:16 +0300 |
| commit | 880b583ce10886578f840cf4e7205826ea9165df (patch) | |
| tree | 45d38a0aaa05695984ef625a9489d4ec3269572e /net | |
| parent | 8d7533e5aaad1c94386a8101a36b0617987966b7 (diff) | |
| parent | b4f7f4ad425a84fd5d40da21aff8681997b25ff9 (diff) | |
| download | linux-880b583ce10886578f840cf4e7205826ea9165df.tar.xz | |
Merge tag 'mac80211-for-davem-2016-10-27' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Just two fixes:
* a fix to process all events while suspending, so any
potential calls into the driver are done before it is
suspended
* small markup fixes for the sphinx documentation conversion
that's coming into the tree via the doc tree
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/sysfs.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c index 0082f4b01795..14b3f007826d 100644 --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c @@ -104,13 +104,16 @@ static int wiphy_suspend(struct device *dev) rtnl_lock(); if (rdev->wiphy.registered) { - if (!rdev->wiphy.wowlan_config) + if (!rdev->wiphy.wowlan_config) { cfg80211_leave_all(rdev); + cfg80211_process_rdev_events(rdev); + } if (rdev->ops->suspend) ret = rdev_suspend(rdev, rdev->wiphy.wowlan_config); if (ret == 1) { /* Driver refuse to configure wowlan */ cfg80211_leave_all(rdev); + cfg80211_process_rdev_events(rdev); ret = rdev_suspend(rdev, NULL); } } |