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

Commit 66ded1f8 authored by Franky Lin's avatar Franky Lin Committed by Kalle Valo
Browse files

brcmfmac: wrap brcmf_fws_reset_interface into bcdc layer 



Create a new protocol interface function brcmf_proto_reset_if for core
module to notify protocol layer when interface role changes.

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 c02a5eb8

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

+7 −0
Original line number Diff line number Diff line
@@ -411,6 +411,12 @@ brcmf_proto_bcdc_del_if(struct brcmf_if *ifp) 
	brcmf_fws_del_interface(ifp);

}



static void

brcmf_proto_bcdc_reset_if(struct brcmf_if *ifp)

{

	brcmf_fws_reset_interface(ifp);

}



int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)

{

	struct brcmf_bcdc *bcdc;
@@ -436,6 +442,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) 
	drvr->proto->rxreorder = brcmf_proto_bcdc_rxreorder;

	drvr->proto->add_if = brcmf_proto_bcdc_add_if;

	drvr->proto->del_if = brcmf_proto_bcdc_del_if;

	drvr->proto->reset_if = brcmf_proto_bcdc_reset_if;

	drvr->proto->pd = bcdc;



	drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;

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

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

#include "debug.h"

#include "tracepoint.h"

#include "fwsignal.h"

#include "fweh.h"

#include "fwil.h"

#include "proto.h"
@@ -180,7 +179,7 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr, 
	}



	if (ifp && ifevent->action == BRCMF_E_IF_CHANGE)

		brcmf_fws_reset_interface(ifp);

		brcmf_proto_reset_if(drvr, ifp);



	err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);

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

+9 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ struct brcmf_proto { 
	void (*rxreorder)(struct brcmf_if *ifp, struct sk_buff *skb);

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

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

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

	void *pd;

};
@@ -136,4 +137,12 @@ brcmf_proto_del_if(struct brcmf_pub *drvr, struct brcmf_if *ifp) 
	drvr->proto->del_if(ifp);

}



static inline void

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

{

	if (!drvr->proto->reset_if)

		return;

	drvr->proto->reset_if(ifp);

}



#endif /* BRCMFMAC_PROTO_H */