UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
 -----BEGIN PGP SIGNATURE-----
 
 iQFJBAABCgAzFiEEiBjanGPFTz4PRfLobhckVSbrbZsFAmDOEp8VHGt2YWxvQGNv
 ZGVhdXJvcmEub3JnAAoJEG4XJFUm622bnqgIAI0PL/+2jNY6q6aJ8QK0PEYThDJH
 CoWwb5JktkbqNq1nco/c7EqEKPq8TLyP3/SGhfZuiPcp2J+OlztHP3dMbQzm9du8
 6rDGf/g7ZVY20GHr1rtZDNnRct054Vx/I1UMF4vMZdk2BCXrkycgvCfK5Rqg/2RU
 5pA5c9/ZOguWDAbOEMAP+/G6bHFlpy1nasT5jNuYswjZJ28zgkWJKRi1QQFoe5Qn
 y8TYGNCdwI4Jf93zTiiH5sJ9sFqjpMz04L9nMoEzCodgMKXAnMmqr0YjcWqxpagt
 DeU80Bo189pw7CkeOEPhC75l2LM/N6llFINAAD69miPQGiyzJGZwUtxhMPE=
 =rpHP
 -----END PGP SIGNATURE-----

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: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2021-06-21 12:21:46 -07:00
parent 536ba2e06d 1f9482aa8d
commit 0d98ec879d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/wireless/marvell/mwifiex/main.c
View File

@ -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);
wiphy_unlock(adapter->wiphy);
}
rtnl_unlock();
}