Commit c63e792b authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: use round_up() instead of _RND8() 



Use in-kernel round_up() instead of custom _RND8().
Just remove _RND8 where it is not necessary to round up.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220407125742.7814-4-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79f5d88f

drivers/staging/r8188eu/hal/rtl8188eu_xmit.c

+3 −3
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmit 
	pfirstframe = pxmitframe;

	len = xmitframe_need_length(pfirstframe) + TXDESC_SIZE + (pfirstframe->pkt_offset * PACKET_OFFSET_SZ);

	pbuf_tail = len;

	pbuf = _RND8(pbuf_tail);

	pbuf = round_up(pbuf_tail, 8);



	/*  check pkt amount in one bulk */

	desc_cnt = 0;
@@ -488,7 +488,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmit 


		len = xmitframe_need_length(pxmitframe) + TXDESC_SIZE + (pxmitframe->pkt_offset * PACKET_OFFSET_SZ);



		if (_RND8(pbuf + len) > MAX_XMITBUF_SZ) {

		if (pbuf + len > MAX_XMITBUF_SZ) {

			pxmitframe->agg_num = 1;

			pxmitframe->pkt_offset = 1;

			break;
@@ -511,7 +511,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmit 


		/*  handle pointer and stop condition */

		pbuf_tail = pbuf + len;

		pbuf = _RND8(pbuf_tail);

		pbuf = round_up(pbuf_tail, 8);



		pfirstframe->agg_num++;

		if (MAX_TX_AGG_PACKET_NUMBER == pfirstframe->agg_num)

drivers/staging/r8188eu/include/osdep_service.h

+0 −8
Original line number Diff line number Diff line
@@ -96,14 +96,6 @@ static inline void flush_signals_thread(void) 


#define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r))



static inline u32 _RND8(u32 sz)

{

	u32	val;



	val = ((sz >> 3) + ((sz & 7) ? 1: 0)) << 3;

	return val;

}



static inline u32 _RND128(u32 sz)

{

	u32	val;