lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 471/800] wil6210: remove erroneous wiphy locking
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    [ Upstream commit 8f78caa2264ece71c2e207cba023f28ab6665138 ]

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

    Fixes: a05829a7222e ("cfg80211: avoid holding the RTNL when calling the driver")
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20210426212929.83f1de07c2cd.I630a2a00eff185ba0452324b3d3f645e01128a95@changeid
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/ath/wil6210/cfg80211.c | 2 --
    1 file changed, 2 deletions(-)

    diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
    index 6746fd206d2a..1ff2679963f0 100644
    --- a/drivers/net/wireless/ath/wil6210/cfg80211.c
    +++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
    @@ -2842,9 +2842,7 @@ void wil_p2p_wdev_free(struct wil6210_priv *wil)
    wil->radio_wdev = wil->main_ndev->ieee80211_ptr;
    mutex_unlock(&wil->vif_mutex);
    if (p2p_wdev) {
    - wiphy_lock(wil->wiphy);
    cfg80211_unregister_wdev(p2p_wdev);
    - wiphy_unlock(wil->wiphy);
    kfree(p2p_wdev);
    }
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 11:09    [W:2.517 / U:0.452 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site