diff options
Diffstat (limited to 'package/kernel/mac80211/patches/370-0009-brcmfmac-Deleting-of-p2p-device-is-leaking-memory.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/370-0009-brcmfmac-Deleting-of-p2p-device-is-leaking-memory.patch | 124 |
1 files changed, 0 insertions, 124 deletions
diff --git a/package/kernel/mac80211/patches/370-0009-brcmfmac-Deleting-of-p2p-device-is-leaking-memory.patch b/package/kernel/mac80211/patches/370-0009-brcmfmac-Deleting-of-p2p-device-is-leaking-memory.patch deleted file mode 100644 index 1988b5cb6b..0000000000 --- a/package/kernel/mac80211/patches/370-0009-brcmfmac-Deleting-of-p2p-device-is-leaking-memory.patch +++ /dev/null @@ -1,124 +0,0 @@ -From: Hante Meuleman <meuleman@broadcom.com> -Date: Fri, 18 Sep 2015 22:08:12 +0200 -Subject: [PATCH] brcmfmac: Deleting of p2p device is leaking memory. - -When a p2p device gets deleted, the memory for the vif is not being -released. This is solved by reorganizing the cleanup path and -properly freeing the memory. - -Reviewed-by: Arend Van Spriel <arend@broadcom.com> -Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> -Signed-off-by: Hante Meuleman <meuleman@broadcom.com> -Signed-off-by: Arend van Spriel <arend@broadcom.com> -Signed-off-by: Kalle Valo <kvalo@codeaurora.org> ---- - ---- a/drivers/net/wireless/brcm80211/brcmfmac/core.c -+++ b/drivers/net/wireless/brcm80211/brcmfmac/core.c -@@ -887,6 +887,16 @@ static void brcmf_del_if(struct brcmf_pu - cancel_work_sync(&ifp->multicast_work); - } - brcmf_net_detach(ifp->ndev); -+ } else { -+ /* Only p2p device interfaces which get dynamically created -+ * end up here. In this case the p2p module should be informed -+ * about the removal of the interface within the firmware. If -+ * not then p2p commands towards the firmware will cause some -+ * serious troublesome side effects. The p2p module will clean -+ * up the ifp if needed. -+ */ -+ brcmf_p2p_ifp_removed(ifp); -+ kfree(ifp); - } - } - -@@ -894,7 +904,8 @@ void brcmf_remove_interface(struct brcmf - { - if (!ifp || WARN_ON(ifp->drvr->iflist[ifp->bssidx] != ifp)) - return; -- -+ brcmf_dbg(TRACE, "Enter, bssidx=%d, ifidx=%d\n", ifp->bssidx, -+ ifp->ifidx); - brcmf_fws_del_interface(ifp); - brcmf_del_if(ifp->drvr, ifp->bssidx); - } ---- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c -+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c -@@ -2131,20 +2131,6 @@ fail: - } - - /** -- * brcmf_p2p_delete_p2pdev() - delete P2P_DEVICE virtual interface. -- * -- * @vif: virtual interface object to delete. -- */ --static void brcmf_p2p_delete_p2pdev(struct brcmf_p2p_info *p2p, -- struct brcmf_cfg80211_vif *vif) --{ -- cfg80211_unregister_wdev(&vif->wdev); -- p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif = NULL; -- brcmf_remove_interface(vif->ifp); -- brcmf_free_vif(vif); --} -- --/** - * brcmf_p2p_add_vif() - create a new P2P virtual interface. - * - * @wiphy: wiphy device of new interface. -@@ -2264,9 +2250,11 @@ int brcmf_p2p_del_vif(struct wiphy *wiph - break; - - case NL80211_IFTYPE_P2P_DEVICE: -+ if (!p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif) -+ return 0; - brcmf_p2p_cancel_remain_on_channel(vif->ifp); - brcmf_p2p_deinit_discovery(p2p); -- brcmf_p2p_delete_p2pdev(p2p, vif); -+ brcmf_remove_interface(vif->ifp); - return 0; - default: - return -ENOTSUPP; -@@ -2298,6 +2286,21 @@ int brcmf_p2p_del_vif(struct wiphy *wiph - return err; - } - -+void brcmf_p2p_ifp_removed(struct brcmf_if *ifp) -+{ -+ struct brcmf_cfg80211_info *cfg; -+ struct brcmf_cfg80211_vif *vif; -+ -+ brcmf_dbg(INFO, "P2P: device interface removed\n"); -+ vif = ifp->vif; -+ cfg = wdev_to_cfg(&vif->wdev); -+ cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif = NULL; -+ rtnl_lock(); -+ cfg80211_unregister_wdev(&vif->wdev); -+ rtnl_unlock(); -+ brcmf_free_vif(vif); -+} -+ - int brcmf_p2p_start_device(struct wiphy *wiphy, struct wireless_dev *wdev) - { - struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy); -@@ -2422,10 +2425,7 @@ void brcmf_p2p_detach(struct brcmf_p2p_i - if (vif != NULL) { - brcmf_p2p_cancel_remain_on_channel(vif->ifp); - brcmf_p2p_deinit_discovery(p2p); -- /* remove discovery interface */ -- rtnl_lock(); -- brcmf_p2p_delete_p2pdev(p2p, vif); -- rtnl_unlock(); -+ brcmf_remove_interface(vif->ifp); - } - /* just set it all to zero */ - memset(p2p, 0, sizeof(*p2p)); ---- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.h -+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.h -@@ -156,6 +156,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s - int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev); - int brcmf_p2p_ifchange(struct brcmf_cfg80211_info *cfg, - enum brcmf_fil_p2p_if_types if_type); -+void brcmf_p2p_ifp_removed(struct brcmf_if *ifp); - int brcmf_p2p_start_device(struct wiphy *wiphy, struct wireless_dev *wdev); - void brcmf_p2p_stop_device(struct wiphy *wiphy, struct wireless_dev *wdev); - int brcmf_p2p_scan_prep(struct wiphy *wiphy, |