diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-01 13:31:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-01 13:31:15 -0700 |
| commit | 612307c6bebc0651cf36b6bf76249898f595fd64 (patch) | |
| tree | 6b294dcd3806cce0bf1183c00248b02b7030cdfc /net/wireless/sysfs.c | |
| parent | 0989bd034a125cef29bd6351514d588fc616b39a (diff) | |
| parent | 7d65f82954dadbbe7b6e1aec7e07ad17bc6d958b (diff) | |
| download | linux-612307c6bebc0651cf36b6bf76249898f595fd64.tar.gz linux-612307c6bebc0651cf36b6bf76249898f595fd64.tar.xz | |
Merge tag 'mac80211-for-davem-2017-03-31' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Two fixes:
* don't block netdev queues (indefinitely!) if mac80211
manages traffic queueing itself
* check wiphy registration before checking for ops
on resume, to avoid crash
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/sysfs.c')
| -rw-r--r-- | net/wireless/sysfs.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c index 16b6b5988be9..570a2b67ca10 100644 --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c @@ -132,12 +132,10 @@ static int wiphy_resume(struct device *dev) /* Age scan results with time spent in suspend */ cfg80211_bss_age(rdev, get_seconds() - rdev->suspend_at); - if (rdev->ops->resume) { - rtnl_lock(); - if (rdev->wiphy.registered) - ret = rdev_resume(rdev); - rtnl_unlock(); - } + rtnl_lock(); + if (rdev->wiphy.registered && rdev->ops->resume) + ret = rdev_resume(rdev); + rtnl_unlock(); return ret; } |