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

Commit 3441d08c authored by Luca Ceresoli's avatar Luca Ceresoli Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: rtw_set_fixed_ie(): accept void* parameters 



rtw_set_ie() is a memcpy-like function, taking addresses of memory buffers
among its parameters. Similarly to memcpy, change the parameters to be
void*. This will allow to get rid of typecasts whenever it is called.

Signed-off-by: default avatarLuca Ceresoli <luca@lucaceresoli.net>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f22c2468

drivers/staging/rtl8188eu/core/rtw_ieee80211.c

+4 −4
Original line number Diff line number Diff line
@@ -130,12 +130,12 @@ int rtw_check_network_type(unsigned char *rate, int ratelen, int channel) 
	}

}



u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len, unsigned char *source,

u8 *rtw_set_fixed_ie(void *pbuf, unsigned int len, void *source,

		     unsigned int *frlen)

{

	memcpy((void *)pbuf, (void *)source, len);

	memcpy(pbuf, source, len);

	*frlen = *frlen + len;

	return pbuf + len;

	return ((u8 *)pbuf) + len;

}



/*  rtw_set_ie will update frame length */

drivers/staging/rtl8188eu/include/ieee80211.h

+2 −2
Original line number Diff line number Diff line
@@ -1092,8 +1092,8 @@ enum parse_res rtw_ieee802_11_parse_elems(u8 *start, uint len, 
					  struct rtw_ieee802_11_elems *elems,

					  int show_errors);



u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len,

		     unsigned char *source, unsigned int *frlen);

u8 *rtw_set_fixed_ie(void *pbuf, unsigned int len,

		     void *source, unsigned int *frlen);

u8 *rtw_set_ie(u8 *pbuf, int index, uint len, u8 *source, uint *frlen);



enum secondary_ch_offset {