Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 612307c6 authored Apr 01, 2017 by David S. Miller

Merge tag 'mac80211-for-davem-2017-03-31' of...

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>

parents 0989bd03 7d65f829

net/mac80211/iface.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -718,7 +718,8 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
		ieee80211_recalc_ps(local);

		if (sdata->vif.type == NL80211_IFTYPE_MONITOR \|\|
		sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
		sdata->vif.type == NL80211_IFTYPE_AP_VLAN \|\|
		local->ops->wake_tx_queue) {
		/* XXX: for AP_VLAN, actually track AP queues */
		netif_tx_start_all_queues(dev);
		} else if (dev) {

net/wireless/sysfs.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -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)
		if (rdev->wiphy.registered && rdev->ops->resume)
		ret = rdev_resume(rdev);
		rtnl_unlock();
		}

		return ret;
		}