openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Luca Ceresoli 2015-09-22 23:50:36 +02:00 committed by Greg Kroah-Hartman
parent f22c2468b6
commit 3441d08ca2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/rtl8188eu/core/rtw_ieee80211.c
View File

@ -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,
unsigned int *frlen)
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 */

4
drivers/staging/rtl8188eu/include/ieee80211.h
View File

@ -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 {