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

Commit 05f8a616 authored by Seth Forshee's avatar Seth Forshee Committed by John W. Linville
Browse files

brcmsmac: Add helper function for updating txavail count 



Use this helper function rather than open-coding the same calculation in
multiple places.

Signed-off-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Tested-by: default avatarDaniel Wagner <wagi@monom.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5c8067ca

drivers/net/wireless/brcm80211/brcmsmac/dma.c

+13 −2
Original line number Diff line number Diff line
@@ -1264,6 +1264,17 @@ bool dma_rxreset(struct dma_pub *pub) 
	return status == D64_RS0_RS_DISABLED;

}



/* Update count of available tx descriptors based on current DMA state */

static void dma_update_txavail(struct dma_info *di)

{

	/*

	 * Available space is number of descriptors less the number of

	 * active descriptors and the number of queued AMPDU frames.

	 */

	di->dma.txavail = di->ntxd - ntxdactive(di, di->txin, di->txout) - 1;

}





/*

 * !! tx entry routine

 * WARNING: call must check the return value for error.
@@ -1325,7 +1336,7 @@ int dma_txfast(struct dma_pub *pub, struct sk_buff *p, bool commit) 
		      di->xmtptrbase + I2B(txout, struct dma64desc));



	/* tx flow control */

	di->dma.txavail = di->ntxd - ntxdactive(di, di->txin, di->txout) - 1;

	dma_update_txavail(di);



	return 0;
@@ -1412,7 +1423,7 @@ struct sk_buff *dma_getnexttxp(struct dma_pub *pub, enum txd_range range) 
	di->txin = i;



	/* tx flow control */

	di->dma.txavail = di->ntxd - ntxdactive(di, di->txin, di->txout) - 1;

	dma_update_txavail(di);



	return txp;