Commit 8f78caa2 authored by Johannes Berg's avatar Johannes Berg Committed by Kalle Valo
Browse files

wil6210: remove erroneous wiphy locking 



We already hold the wiphy lock in all cases when we get
here, so this would deadlock, remove the erroneous locking.

Fixes: a05829a7 ("cfg80211: avoid holding the RTNL when calling the driver")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210426212929.83f1de07c2cd.I630a2a00eff185ba0452324b3d3f645e01128a95@changeid
parent 75596eab

drivers/net/wireless/ath/wil6210/cfg80211.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -2842,9 +2842,7 @@ void wil_p2p_wdev_free(struct wil6210_priv *wil) 
	wil->radio_wdev = wil->main_ndev->ieee80211_ptr;

	wil->radio_wdev = wil->main_ndev->ieee80211_ptr;

	mutex_unlock(&wil->vif_mutex);

	mutex_unlock(&wil->vif_mutex);

	if (p2p_wdev) {

	if (p2p_wdev) {

		wiphy_lock(wil->wiphy);

		cfg80211_unregister_wdev(p2p_wdev);

		cfg80211_unregister_wdev(p2p_wdev);

		wiphy_unlock(wil->wiphy);

		kfree(p2p_wdev);

		kfree(p2p_wdev);

	}

	}

}

}