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

Commit c67d41ba authored by Arend van Spriel's avatar Arend van Spriel Committed by Kalle Valo
Browse files

brcmfmac: change prototype for brcmf_fws_hdrpull() 



Instead of passing ifidx and drvr just pass struct brcmf_if pointer
which holds both parameters.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 03cca20a

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

+1 −2
Original line number Diff line number Diff line
@@ -312,8 +312,7 @@ brcmf_proto_bcdc_hdrpull(struct brcmf_pub *drvr, bool do_fws, 


	skb_pull(pktbuf, BCDC_HEADER_LEN);

	if (do_fws)

		brcmf_fws_hdrpull(drvr, tmp_if->ifidx, h->data_offset << 2,

				  pktbuf);

		brcmf_fws_hdrpull(tmp_if, h->data_offset << 2, pktbuf);

	else

		skb_pull(pktbuf, h->data_offset << 2);

drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c

+10 −13
Original line number Diff line number Diff line
@@ -1616,11 +1616,10 @@ static int brcmf_fws_notify_bcmc_credit_support(struct brcmf_if *ifp, 
	return 0;

}



int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,

		      struct sk_buff *skb)

void brcmf_fws_hdrpull(struct brcmf_if *ifp, s16 siglen, struct sk_buff *skb)

{

	struct brcmf_skb_reorder_data *rd;

	struct brcmf_fws_info *fws = drvr->fws;

	struct brcmf_fws_info *fws = ifp->drvr->fws;

	u8 *signal_data;

	s16 data_len;

	u8 type;
@@ -1630,20 +1629,20 @@ int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len, 
	s32 err;



	brcmf_dbg(HDRS, "enter: ifidx %d, skblen %u, sig %d\n",

		  ifidx, skb->len, signal_len);

		  ifp->ifidx, skb->len, siglen);



	WARN_ON(signal_len > skb->len);

	WARN_ON(siglen > skb->len);



	if (!signal_len)

		return 0;

	if (!siglen)

		return;

	/* if flow control disabled, skip to packet data and leave */

	if ((!fws) || (!fws->fw_signals)) {

		skb_pull(skb, signal_len);

		return 0;

		skb_pull(skb, siglen);

		return;

	}



	fws->stats.header_pulls++;

	data_len = signal_len;

	data_len = siglen;

	signal_data = skb->data;



	status = BRCMF_FWS_RET_OK_NOSCHEDULE;
@@ -1731,14 +1730,12 @@ int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len, 
	/* signalling processing result does

	 * not affect the actual ethernet packet.

	 */

	skb_pull(skb, signal_len);

	skb_pull(skb, siglen);



	/* this may be a signal-only packet

	 */

	if (skb->len == 0)

		fws->stats.header_only_pkt++;



	return 0;

}



static u8 brcmf_fws_precommit_skb(struct brcmf_fws_info *fws, int fifo,

drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
int brcmf_fws_init(struct brcmf_pub *drvr);

void brcmf_fws_deinit(struct brcmf_pub *drvr);

bool brcmf_fws_fc_active(struct brcmf_fws_info *fws);

int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,

		      struct sk_buff *skb);

void brcmf_fws_hdrpull(struct brcmf_if *ifp, s16 siglen, struct sk_buff *skb);

int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb);



void brcmf_fws_reset_interface(struct brcmf_if *ifp);