Commit eab5d543 authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Use round_up() instead of _RND4() 



Signed-off-by: default avatarnavin patidar <navin.patidar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 248df424

drivers/staging/rtl8188eu/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ int rtw_cmd_thread(void *context) 


		pcmdpriv->cmd_issued_cnt++;



		pcmd->cmdsz = _RND4((pcmd->cmdsz));/* _RND4 */

		pcmd->cmdsz = round_up(pcmd->cmdsz, 4);



		memcpy(pcmdbuf, pcmd->parmbuf, pcmd->cmdsz);

drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c

+2 −2
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp 


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



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

		if (round_up(pbuf + len, 8) > MAX_XMITBUF_SZ) {

			pxmitframe->agg_num = 1;

			pxmitframe->pkt_offset = 1;

			break;
@@ -567,7 +567,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp 


		/*  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/rtl8188eu/include/osdep_service.h

+0 −8
Original line number Diff line number Diff line
@@ -181,14 +181,6 @@ static inline void flush_signals_thread(void) 
#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)

{

	u32	val;



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

	return val;

}



struct rtw_netdev_priv_indicator {

	void *priv;

	u32 sizeof_priv;

drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb) 
			pkt_offset = (u16) round_up(pkt_offset, 128);

			break;

		case USB_RX_AGG_USB:

			pkt_offset = (u16)_RND4(pkt_offset);

			pkt_offset = (u16) round_up(pkt_offset, 4);

			break;

		case USB_RX_AGG_DISABLE:

		default: