Commit 0d98ec87 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-2021-06-19' of... 

Merge tag 'wireless-drivers-2021-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for v5.13

Only one important fix for an mwifiex regression.

mwifiex

* fix deadlock during rmmod or firmware reset, regression from
  cfg80211 RTNL changes in v5.12-rc1
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 536ba2e0 1f9482aa

drivers/net/wireless/marvell/mwifiex/main.c

+10 −3
Original line number Diff line number Diff line
@@ -1445,11 +1445,18 @@ static void mwifiex_uninit_sw(struct mwifiex_adapter *adapter) 
		if (!priv)

			continue;

		rtnl_lock();

		wiphy_lock(adapter->wiphy);

		if (priv->netdev &&

		    priv->wdev.iftype != NL80211_IFTYPE_UNSPECIFIED)

		    priv->wdev.iftype != NL80211_IFTYPE_UNSPECIFIED) {

			/*

			 * Close the netdev now, because if we do it later, the

			 * netdev notifiers will need to acquire the wiphy lock

			 * again --> deadlock.

			 */

			dev_close(priv->wdev.netdev);

			wiphy_lock(adapter->wiphy);

			mwifiex_del_virtual_intf(adapter->wiphy, &priv->wdev);

			wiphy_unlock(adapter->wiphy);

		}

		rtnl_unlock();

	}