package/kernel/mac80211/patches/359-0006-brcmfmac-free-ifp-for-non-netdev-interface-in-p2p-mo.patch

   1 From: Arend van Spriel <arend@broadcom.com>
   2 Date: Thu, 11 Jun 2015 00:12:21 +0200
   3 Subject: [PATCH] brcmfmac: free ifp for non-netdev interface in p2p module
   4
   5 Making it more clear by freeing the ifp in same place where the
   6 vif object is freed.
   7
   8 Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
   9 Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
  10 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
  11 Signed-off-by: Arend van Spriel <arend@broadcom.com>
  12 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  13 ---
  14
  15 --- a/drivers/net/wireless/brcm80211/brcmfmac/core.c
  16 +++ b/drivers/net/wireless/brcm80211/brcmfmac/core.c
  17 @@ -867,8 +867,6 @@ static void brcmf_del_if(struct brcmf_pu
  18                 }
  19                 /* unregister will take care of freeing it */
  20                 unregister_netdev(ifp->ndev);
  21 -       } else {
  22 -               kfree(ifp);
  23         }
  24  }
  25
  26 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
  27 +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
  28 @@ -2238,6 +2238,7 @@ static void brcmf_p2p_delete_p2pdev(stru
  29  {
  30         cfg80211_unregister_wdev(&vif->wdev);
  31         p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif = NULL;
  32 +       kfree(vif->ifp);
  33         brcmf_free_vif(vif);
  34  }
  35
  36 @@ -2361,6 +2362,8 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
  37                 break;
  38
  39         case NL80211_IFTYPE_P2P_DEVICE:
  40 +               brcmf_p2p_cancel_remain_on_channel(vif->ifp);
  41 +               brcmf_p2p_deinit_discovery(p2p);
  42                 brcmf_p2p_delete_p2pdev(p2p, vif);
  43                 return 0;
  44         default: