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

staging: r8188eu: use PTR_ALIGN() instead of RND4() 



Use in-kernel PTR_ALIGN() instead of custom RND4().

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


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

drivers/staging/r8188eu/core/rtw_security.c

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ void rtw_wep_encrypt(struct adapter *padapter, struct xmit_frame *pxmitframe) 
				arc4_crypt(ctx, payload + length, crc.f1, 4);



				pframe += pxmitpriv->frag_len;

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

				pframe = PTR_ALIGN(pframe, 4);

			}

		}

	}
@@ -504,7 +504,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, struct xmit_frame *pxmitframe) 
					arc4_crypt(ctx, payload + length, crc.f1, 4);



					pframe += pxmitpriv->frag_len;

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

					pframe = PTR_ALIGN(pframe, 4);

				}

			}

		} else {
@@ -1133,7 +1133,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, struct xmit_frame *pxmitframe) 


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

					pframe += pxmitpriv->frag_len;

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

					pframe = PTR_ALIGN(pframe, 4);

				}

			}

		} else {

drivers/staging/r8188eu/core/rtw_xmit.c

+2 −5
Original line number Diff line number Diff line
@@ -642,7 +642,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_t)(payload));

				payload = PTR_ALIGN(payload, 4);



				payload = payload + pattrib->hdrlen + pattrib->iv_len;

				if ((curfragnum + 1) == pattrib->nr_frags) {
@@ -868,7 +868,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct 
{

	struct pkt_file pktfile;

	s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz;

	size_t addr;

	u8 *pframe, *mem_start;

	u8 hw_hdr_offset;

	struct sta_info		*psta;
@@ -985,9 +984,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct 
			break;

		}



		addr = (size_t)(pframe);



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

		mem_start = PTR_ALIGN(pframe, 4) + hw_hdr_offset;

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

	}

drivers/staging/r8188eu/hal/rtl8188eu_xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static s32 rtw_dump_xframe(struct adapter *adapt, struct xmit_frame *pxmitframe) 


		mem_addr += w_sz;



		mem_addr = (u8 *)RND4(((size_t)(mem_addr)));

		mem_addr = PTR_ALIGN(mem_addr, 4);

	}



	rtw_free_xmitframe(pxmitpriv, pxmitframe);

drivers/staging/r8188eu/include/osdep_service.h

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,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)

{