Commit 87fe08d7 authored by Ross Schmidt's avatar Ross Schmidt Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: replace RND4 with round_up() 



Use round_up instead of define RND4.

Signed-off-by: default avatarRoss Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201004011743.10750-1-ross.schm.dev@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_security.c

+3 −3
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe) 
				arcfour_encrypt(&mycontext, payload+length, crc, 4);



				pframe += pxmitpriv->frag_len;

				pframe = (u8 *)RND4((SIZE_PTR)(pframe));

				pframe = (u8 *)round_up((SIZE_PTR)(pframe), 4);

			}

		}
@@ -716,7 +716,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe) 
					arcfour_encrypt(&mycontext, payload+length, crc, 4);



					pframe += pxmitpriv->frag_len;

					pframe = (u8 *)RND4((SIZE_PTR)(pframe));

					pframe = (u8 *)round_up((SIZE_PTR)(pframe), 4);

				}

			}
@@ -1523,7 +1523,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe) 


				aes_cipher(prwskey, pattrib->hdrlen, pframe, length);

				pframe += pxmitpriv->frag_len;

				pframe = (u8 *)RND4((SIZE_PTR)(pframe));

				pframe = (u8 *)round_up((SIZE_PTR)(pframe), 4);

			}

		}

drivers/staging/rtl8723bs/core/rtw_xmit.c

+2 −2
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr 
			payload = pframe;



			for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {

				payload = (u8 *)RND4((SIZE_PTR)(payload));

				payload = (u8 *)round_up((SIZE_PTR)(payload), 4);

				RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("===curfragnum =%d, pframe = 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x,!!!\n",

					curfragnum, *payload, *(payload+1), *(payload+2), *(payload+3), *(payload+4), *(payload+5), *(payload+6), *(payload+7)));
@@ -1209,7 +1209,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_fram 


		addr = (SIZE_PTR)(pframe);



		mem_start = (unsigned char *)RND4(addr) + hw_hdr_offset;

		mem_start = (unsigned char *)round_up(addr, 4) + hw_hdr_offset;

		memcpy(mem_start, pbuf_start + hw_hdr_offset, pattrib->hdrlen);

	}

drivers/staging/rtl8723bs/hal/sdio_ops.c

+3 −3
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ static s32 _sdio_local_read( 
	if (!mac_pwr_ctrl_on)

		return _sd_cmd52_read(intfhdl, addr, cnt, buf);



	n = RND4(cnt);

	n = round_up(cnt, 4);

	tmpbuf = rtw_malloc(n);

	if (!tmpbuf)

		return -1;
@@ -575,7 +575,7 @@ s32 sdio_local_read( 
	)

		return sd_cmd52_read(intfhdl, addr, cnt, buf);



	n = RND4(cnt);

	n = round_up(cnt, 4);

	tmpbuf = rtw_malloc(n);

	if (!tmpbuf)

		return -1;
@@ -859,7 +859,7 @@ static struct recv_buf *sd_recv_rxfifo(struct adapter *adapter, u32 size) 


	/*  Patch for some SDIO Host 4 bytes issue */

	/*  ex. RK3188 */

	readsize = RND4(size);

	readsize = round_up(size, 4);



	/* 3 1. alloc recvbuf */

	recv_priv = &adapter->recvpriv;

drivers/staging/rtl8723bs/include/osdep_service.h

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ static inline int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *par 
}



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

#define RND4(x)	(((x >> 2) + (((x & 3) == 0) ?  0 : 1)) << 2)



static inline u32 _RND4(u32 sz)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE