wifi: brcmfmac: rename function that frees vif

Since the commit cf124db566e6 ("net: Fix inconsistent teardown and
release of private netdev state.") netdev isn't freed anymore in the
brcmf_cfg80211_free_netdev(). Adjust this function name to match what it
actually does (freeing vif).

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Link: https://patch.msgid.link/20251215103817.29598-1-zajec5@gmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index bb96b87b2a6e56c7166af5572f568ffdef59ffb3..61f7e620cab3a97e39bcac5674b3e0bffaa926c3 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -932,7 +932,7 @@ static struct wireless_dev *brcmf_mon_add_vif(struct wiphy *wiphy,
        ndev->type = ARPHRD_IEEE80211_RADIOTAP;
        ndev->ieee80211_ptr = &vif->wdev;
        ndev->needs_free_netdev = true;
-       ndev->priv_destructor = brcmf_cfg80211_free_netdev;
+       ndev->priv_destructor = brcmf_cfg80211_free_vif;
        SET_NETDEV_DEV(ndev, wiphy_dev(cfg->wiphy));
 
        ifp = netdev_priv(ndev);
@@ -6082,7 +6082,7 @@ void brcmf_free_vif(struct brcmf_cfg80211_vif *vif)
        kfree(vif);
 }
 
-void brcmf_cfg80211_free_netdev(struct net_device *ndev)
+void brcmf_cfg80211_free_vif(struct net_device *ndev)
 {
        struct brcmf_cfg80211_vif *vif;
        struct brcmf_if *ifp;

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
index 8d7e2be15acac8d51c23af53867c10977c656ad5..6ceb301429054ccbb9e3bc402555e18887d92ed0 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
@@ -493,7 +493,7 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
 void brcmf_set_mpc(struct brcmf_if *ndev, int mpc);
 bool brcmf_is_apmode_operating(struct wiphy *wiphy);
 void brcmf_abort_scanning(struct brcmf_cfg80211_info *cfg);
-void brcmf_cfg80211_free_netdev(struct net_device *ndev);
+void brcmf_cfg80211_free_vif(struct net_device *ndev);
 
 int brcmf_set_wsec(struct brcmf_if *ifp, const u8 *key, u16 key_len, u16 flags);
 int brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
index 862a0336a0b59156a4ef77a5fe64fa241c4724fb..616885d6db3f3851d326282b6615e32b3861e855 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
@@ -674,7 +674,7 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool locked)
 
        netif_carrier_off(ndev);
 
-       ndev->priv_destructor = brcmf_cfg80211_free_netdev;
+       ndev->priv_destructor = brcmf_cfg80211_free_vif;
        brcmf_dbg(INFO, "%s: Broadcom Dongle Host Driver\n", ndev->name);
        return 0;
 
@@ -692,7 +692,7 @@ void brcmf_net_detach(struct net_device *ndev, bool locked)
                else
                        unregister_netdev(ndev);
        } else {
-               brcmf_cfg80211_free_netdev(ndev);
+               brcmf_cfg80211_free_vif(ndev);
                free_netdev(ndev);
        }
 }