hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8723au: Use const * for parsing wpa IEs 

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-04-15 19:44:03 +02:00 committed by Greg Kroah-Hartman
parent 731f9da74b
commit 95c4345abf
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/rtl8723au/core/rtw_ieee80211.c
View File

@ -514,7 +514,7 @@ unsigned char *rtw_get_wpa2_ie23a(unsigned char *pie, int *rsn_ie_len, int limit
return rtw_get_ie23a(pie, _WPA2_IE_ID_, rsn_ie_len, limit); return rtw_get_ie23a(pie, _WPA2_IE_ID_, rsn_ie_len, limit);
} }
int rtw_get_wpa_cipher_suite23a(u8 *s) int rtw_get_wpa_cipher_suite23a(const u8 *s)
{ {
if (!memcmp(s, WPA_CIPHER_SUITE_NONE23A, WPA_SELECTOR_LEN)) if (!memcmp(s, WPA_CIPHER_SUITE_NONE23A, WPA_SELECTOR_LEN))
return WPA_CIPHER_NONE; return WPA_CIPHER_NONE;
@ -530,7 +530,7 @@ int rtw_get_wpa_cipher_suite23a(u8 *s)
return 0; return 0;
} }
int rtw_get_wpa2_cipher_suite23a(u8 *s) int rtw_get_wpa2_cipher_suite23a(const u8 *s)
{ {
if (!memcmp(s, RSN_CIPHER_SUITE_NONE23A, RSN_SELECTOR_LEN)) if (!memcmp(s, RSN_CIPHER_SUITE_NONE23A, RSN_SELECTOR_LEN))
return WPA_CIPHER_NONE; return WPA_CIPHER_NONE;
@ -546,11 +546,11 @@ int rtw_get_wpa2_cipher_suite23a(u8 *s)
return 0; return 0;
} }
int rtw_parse_wpa_ie23a(u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x) int rtw_parse_wpa_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x)
{ {
int i, ret = _SUCCESS; int i, ret = _SUCCESS;
int left, count; int left, count;
u8 *pos; const u8 *pos;
u8 SUITE_1X[4] = {0x00, 0x50, 0xf2, 1}; u8 SUITE_1X[4] = {0x00, 0x50, 0xf2, 1};
if (wpa_ie_len <= 0) { if (wpa_ie_len <= 0) {
@ -626,12 +626,12 @@ int rtw_parse_wpa_ie23a(u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pair
return ret; return ret;
} }
int rtw_parse_wpa2_ie23a(u8* rsn_ie, int rsn_ie_len, int *group_cipher, int rtw_parse_wpa2_ie23a(const u8* rsn_ie, int rsn_ie_len, int *group_cipher,
int *pairwise_cipher, int *is_8021x) int *pairwise_cipher, int *is_8021x)
{ {
int i, ret = _SUCCESS; int i, ret = _SUCCESS;
int left, count; int left, count;
u8 *pos; const u8 *pos;
u8 SUITE_1X[4] = {0x00, 0x0f, 0xac, 0x01}; u8 SUITE_1X[4] = {0x00, 0x0f, 0xac, 0x01};
if (rsn_ie_len <= 0) { if (rsn_ie_len <= 0) {
@ -1277,10 +1277,11 @@ int ieee80211_is_empty_essid23a(const char *essid, int essid_len)
static int rtw_get_cipher_info(struct wlan_network *pnetwork) static int rtw_get_cipher_info(struct wlan_network *pnetwork)
{ {
u32 wpa_ielen; u32 wpa_ielen;
unsigned char *pbuf; const u8 *pbuf;
int group_cipher = 0, pairwise_cipher = 0, is8021x = 0; int group_cipher = 0, pairwise_cipher = 0, is8021x = 0;
int ret = _FAIL; int ret = _FAIL;
int r; int r;
pbuf = rtw_get_wpa_ie23a(&pnetwork->network.IEs[12], &wpa_ielen, pbuf = rtw_get_wpa_ie23a(&pnetwork->network.IEs[12], &wpa_ielen,
pnetwork->network.IELength - 12); pnetwork->network.IELength - 12);

8
drivers/staging/rtl8723au/include/ieee80211.h
View File

@ -539,10 +539,10 @@ void rtw_set_supported_rate23a(u8* SupportedRates, uint mode) ;
unsigned char *rtw_get_wpa_ie23a(unsigned char *pie, int *wpa_ie_len, int limit); unsigned char *rtw_get_wpa_ie23a(unsigned char *pie, int *wpa_ie_len, int limit);
unsigned char *rtw_get_wpa2_ie23a(unsigned char *pie, int *rsn_ie_len, int limit); unsigned char *rtw_get_wpa2_ie23a(unsigned char *pie, int *rsn_ie_len, int limit);
int rtw_get_wpa_cipher_suite23a(u8 *s); int rtw_get_wpa_cipher_suite23a(const u8 *s);
int rtw_get_wpa2_cipher_suite23a(u8 *s); int rtw_get_wpa2_cipher_suite23a(const u8 *s);
int rtw_parse_wpa_ie23a(u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x); int rtw_parse_wpa_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x);
int rtw_parse_wpa2_ie23a(u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x); int rtw_parse_wpa2_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x);
int rtw_get_sec_ie23a(u8 *in_ie,uint in_len,u8 *rsn_ie,u16 *rsn_len,u8 *wpa_ie,u16 *wpa_len); int rtw_get_sec_ie23a(u8 *in_ie,uint in_len,u8 *rsn_ie,u16 *rsn_len,u8 *wpa_ie,u16 *wpa_len);