Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fdc64bb authored by Franky Lin's avatar Franky Lin Committed by Kalle Valo
Browse files

brcmfmac: wrap brcmf_fws_add_interface into bcdc layer 



fwsignal is only used by bcdc. Create a new protocol interface function
brcmf_proto_add_if for core module to notify protocol layer upon a new
interface is created.

Signed-off-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 7b584396

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c

+7 −0
Original line number Diff line number Diff line
@@ -399,6 +399,12 @@ static void brcmf_proto_bcdc_rxreorder(struct brcmf_if *ifp, 
	brcmf_fws_rxreorder(ifp, skb);

}



static void

brcmf_proto_bcdc_add_if(struct brcmf_if *ifp)

{

	brcmf_fws_add_interface(ifp);

}



int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)

{

	struct brcmf_bcdc *bcdc;
@@ -422,6 +428,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) 
	drvr->proto->delete_peer = brcmf_proto_bcdc_delete_peer;

	drvr->proto->add_tdls_peer = brcmf_proto_bcdc_add_tdls_peer;

	drvr->proto->rxreorder = brcmf_proto_bcdc_rxreorder;

	drvr->proto->add_if = brcmf_proto_bcdc_add_if;

	drvr->proto->pd = bcdc;



	drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

+1 −1
Original line number Diff line number Diff line
@@ -990,7 +990,7 @@ int brcmf_bus_started(struct device *dev) 
	if (ret < 0)

		goto fail;



	brcmf_fws_add_interface(ifp);

	brcmf_proto_add_if(drvr, ifp);



	drvr->config = brcmf_cfg80211_attach(drvr, bus_if->dev,

					     drvr->settings->p2p_enable);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "fwsignal.h"

#include "fweh.h"

#include "fwil.h"

#include "proto.h"



/**

 * struct brcmf_fweh_queue_item - event item on event queue.
@@ -172,7 +173,7 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr, 
		if (IS_ERR(ifp))

			return;

		if (!is_p2pdev)

			brcmf_fws_add_interface(ifp);

			brcmf_proto_add_if(drvr, ifp);

		if (!drvr->fweh.evt_handler[BRCMF_E_IF])

			if (brcmf_net_attach(ifp, false) < 0)

				return;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h

+9 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ struct brcmf_proto { 
	void (*add_tdls_peer)(struct brcmf_pub *drvr, int ifidx,

			      u8 peer[ETH_ALEN]);

	void (*rxreorder)(struct brcmf_if *ifp, struct sk_buff *skb);

	void (*add_if)(struct brcmf_if *ifp);

	void *pd;

};
@@ -118,4 +119,12 @@ brcmf_proto_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb) 
	ifp->drvr->proto->rxreorder(ifp, skb);

}



static inline void

brcmf_proto_add_if(struct brcmf_pub *drvr, struct brcmf_if *ifp)

{

	if (!drvr->proto->add_if)

		return;

	drvr->proto->add_if(ifp);

}



#endif /* BRCMFMAC_PROTO_H */