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

Commit 62b54fca authored by Alwin Beukers's avatar Alwin Beukers Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: cleanup of transmit buffer size related wrapper function 



Removed brcms_c_xmtfifo_sz_get function.

Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 702e1430

drivers/staging/brcm80211/brcmsmac/ampdu.c

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ static int brcms_c_ffpld_check_txfunfl(struct brcms_c_info *wlc, int fid) 
		return 1;



	/* check if fifo is big enough */

	if (brcms_c_xmtfifo_sz_get(wlc, fid, &xmtfifo_sz))

	if (brcms_b_xmtfifo_sz_get(wlc->hw, fid, &xmtfifo_sz))

		return -1;



	if ((TXFIFO_SIZE_UNIT * (u32) xmtfifo_sz) <= ampdu->ffpld_rsvd)

drivers/staging/brcm80211/brcmsmac/main.c

+1 −6
Original line number Diff line number Diff line
@@ -8809,7 +8809,7 @@ void brcms_c_mhf(struct brcms_c_info *wlc, u8 idx, u16 mask, u16 val, int bands) 
	brcms_b_mhf(wlc->hw, idx, mask, val, bands);

}



static int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo,

int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo,

			   uint *blocks)

{

	if (fifo >= NFIFO)
@@ -8820,11 +8820,6 @@ static int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo, 
	return 0;

}



int brcms_c_xmtfifo_sz_get(struct brcms_c_info *wlc, uint fifo, uint *blocks)

{

	return brcms_b_xmtfifo_sz_get(wlc->hw, fifo, blocks);

}



void brcms_c_write_template_ram(struct brcms_c_info *wlc, int offset, int len,

			    void *buf)

{

drivers/staging/brcm80211/brcmsmac/main.h

+2 −2
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ extern void brcms_c_txq_enq(struct brcms_c_info *wlc, struct scb *scb, 
			    struct sk_buff *sdu, uint prec);

extern void brcms_c_info_init(struct brcms_c_info *wlc, int unit);

extern void brcms_c_print_txstatus(struct tx_status *txs);

extern int brcms_c_xmtfifo_sz_get(struct brcms_c_info *wlc, uint fifo,

extern int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo,

		   uint *blocks);

extern void brcms_c_write_template_ram(struct brcms_c_info *wlc, int offset,

				       int len, void *buf);