1 From c02a5eb82056f75615cb48aa540bfd245f489b99 Mon Sep 17 00:00:00 2001
2 From: Franky Lin <franky.lin@broadcom.com>
3 Date: Fri, 10 Mar 2017 21:17:05 +0000
4 Subject: [PATCH] brcmfmac: wrap brcmf_fws_del_interface into bcdc layer
6 Create a new protocol interface function brcmf_proto_del_if for core
7 module to notify protocol layer upon interface deletion.
9 Signed-off-by: Franky Lin <franky.lin@broadcom.com>
10 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
11 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
13 drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 7 +++++++
14 drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 4 ++--
15 drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h | 9 +++++++++
16 3 files changed, 18 insertions(+), 2 deletions(-)
18 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
19 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
20 @@ -405,6 +405,12 @@ brcmf_proto_bcdc_add_if(struct brcmf_if
21 brcmf_fws_add_interface(ifp);
25 +brcmf_proto_bcdc_del_if(struct brcmf_if *ifp)
27 + brcmf_fws_del_interface(ifp);
30 int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
32 struct brcmf_bcdc *bcdc;
33 @@ -429,6 +435,7 @@ int brcmf_proto_bcdc_attach(struct brcmf
34 drvr->proto->add_tdls_peer = brcmf_proto_bcdc_add_tdls_peer;
35 drvr->proto->rxreorder = brcmf_proto_bcdc_rxreorder;
36 drvr->proto->add_if = brcmf_proto_bcdc_add_if;
37 + drvr->proto->del_if = brcmf_proto_bcdc_del_if;
38 drvr->proto->pd = bcdc;
40 drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;
41 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
42 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
43 @@ -706,7 +706,7 @@ void brcmf_remove_interface(struct brcmf
45 brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", ifp->bsscfgidx,
47 - brcmf_fws_del_interface(ifp);
48 + brcmf_proto_del_if(ifp->drvr, ifp);
49 brcmf_del_if(ifp->drvr, ifp->bsscfgidx, rtnl_locked);
52 @@ -1035,7 +1035,7 @@ fail:
56 - brcmf_fws_del_interface(ifp);
57 + brcmf_proto_del_if(ifp->drvr, ifp);
58 brcmf_fws_deinit(drvr);
60 brcmf_net_detach(ifp->ndev, false);
61 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
62 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
63 @@ -45,6 +45,7 @@ struct brcmf_proto {
65 void (*rxreorder)(struct brcmf_if *ifp, struct sk_buff *skb);
66 void (*add_if)(struct brcmf_if *ifp);
67 + void (*del_if)(struct brcmf_if *ifp);
71 @@ -127,4 +128,12 @@ brcmf_proto_add_if(struct brcmf_pub *drv
72 drvr->proto->add_if(ifp);
76 +brcmf_proto_del_if(struct brcmf_pub *drvr, struct brcmf_if *ifp)
78 + if (!drvr->proto->del_if)
80 + drvr->proto->del_if(ifp);
83 #endif /* BRCMFMAC_PROTO_H */