Commit 0cac3f9e authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Declare rtw_get_wpa{2, }_cipher_suite() static 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0b548a5c

drivers/staging/rtl8723au/core/rtw_ieee80211.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -436,7 +436,7 @@ int rtw_generate_ie23a(struct registry_priv *pregistrypriv) 
	return sz;

	return sz;

}

}





int rtw_get_wpa_cipher_suite23a(const u8 *s)

static int rtw_get_wpa_cipher_suite(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;
@@ -452,7 +452,7 @@ int rtw_get_wpa_cipher_suite23a(const u8 *s) 
	return 0;

	return 0;

}

}





int rtw_get_wpa2_cipher_suite23a(const u8 *s)

static int rtw_get_wpa2_cipher_suite(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;
@@ -490,7 +490,7 @@ int rtw_parse_wpa_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int 
	/* group_cipher */

	/* group_cipher */

	if (left >= WPA_SELECTOR_LEN) {

	if (left >= WPA_SELECTOR_LEN) {





		*group_cipher = rtw_get_wpa_cipher_suite23a(pos);

		*group_cipher = rtw_get_wpa_cipher_suite(pos);





		pos += WPA_SELECTOR_LEN;

		pos += WPA_SELECTOR_LEN;

		left -= WPA_SELECTOR_LEN;

		left -= WPA_SELECTOR_LEN;
@@ -518,7 +518,7 @@ int rtw_parse_wpa_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int 
		}

		}





		for (i = 0; i < count; i++) {

		for (i = 0; i < count; i++) {

			*pairwise_cipher |= rtw_get_wpa_cipher_suite23a(pos);

			*pairwise_cipher |= rtw_get_wpa_cipher_suite(pos);





			pos += WPA_SELECTOR_LEN;

			pos += WPA_SELECTOR_LEN;

			left -= WPA_SELECTOR_LEN;

			left -= WPA_SELECTOR_LEN;
@@ -567,7 +567,7 @@ int rtw_parse_wpa2_ie23a(const u8* rsn_ie, int rsn_ie_len, int *group_cipher, 




	/* group_cipher */

	/* group_cipher */

	if (left >= RSN_SELECTOR_LEN) {

	if (left >= RSN_SELECTOR_LEN) {

		*group_cipher = rtw_get_wpa2_cipher_suite23a(pos);

		*group_cipher = rtw_get_wpa2_cipher_suite(pos);





		pos += RSN_SELECTOR_LEN;

		pos += RSN_SELECTOR_LEN;

		left -= RSN_SELECTOR_LEN;

		left -= RSN_SELECTOR_LEN;
@@ -594,7 +594,7 @@ int rtw_parse_wpa2_ie23a(const u8* rsn_ie, int rsn_ie_len, int *group_cipher, 
		}

		}





		for (i = 0; i < count; i++) {

		for (i = 0; i < count; i++) {

			*pairwise_cipher |= rtw_get_wpa2_cipher_suite23a(pos);

			*pairwise_cipher |= rtw_get_wpa2_cipher_suite(pos);





			pos += RSN_SELECTOR_LEN;

			pos += RSN_SELECTOR_LEN;

			left -= RSN_SELECTOR_LEN;

			left -= RSN_SELECTOR_LEN;

drivers/staging/rtl8723au/include/ieee80211.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -425,8 +425,6 @@ int rtw_ies_remove_ie23a(u8 *ies, uint *ies_len, uint offset, u8 eid, u8 *oui, u 




void rtw_set_supported_rate23a(u8* SupportedRates, uint mode) ;

void rtw_set_supported_rate23a(u8* SupportedRates, uint mode) ;





int rtw_get_wpa_cipher_suite23a(const u8 *s);

int rtw_get_wpa2_cipher_suite23a(const u8 *s);

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_wpa_ie23a(const 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_parse_wpa2_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x);