samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Rename HDD identifier RSNIeLen

Browse Source 
The Linux Coding Style frowns upon mixed-case names so rename HDD
identifier RSNIeLen to be compliant.

Change-Id: I3414f964d2a86915a519f74782820854705c90b6
CRs-Fixed: 2416629
This commit is contained in:
Jeff Johnson
2019-03-09 20:43:43 -08:00
committed by nshrivas
parent d062b8d6d6
commit ddd05cf29d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/hdd/src/wlan_hdd_assoc.c
View File

@@ -5244,7 +5244,7 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
tDot11fIERSN dot11RSNIE = {0}; tDot11fIERSN dot11RSNIE = {0};
tDot11fIEWPA dot11WPAIE = {0}; tDot11fIEWPA dot11WPAIE = {0};
uint8_t *rsn_ie; uint8_t *rsn_ie;
uint16_t RSNIeLen; uint16_t rsn_ie_len;
uint32_t parse_status; uint32_t parse_status;
#ifdef WLAN_CONV_CRYPTO_SUPPORTED #ifdef WLAN_CONV_CRYPTO_SUPPORTED
uint16_t rsn_cap = 0; uint16_t rsn_cap = 0;
@@ -5268,9 +5268,9 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
} }
/* Skip past the EID byte and length byte */ /* Skip past the EID byte and length byte */
rsn_ie = gen_ie + 2; rsn_ie = gen_ie + 2;
RSNIeLen = gen_ie_len - 2; rsn_ie_len = gen_ie_len - 2;
/* Unpack the RSN IE */ /* Unpack the RSN IE */
parse_status = sme_unpack_rsn_ie(mac_handle, rsn_ie, RSNIeLen, parse_status = sme_unpack_rsn_ie(mac_handle, rsn_ie, rsn_ie_len,
&dot11RSNIE, false); &dot11RSNIE, false);
if (!DOT11F_SUCCEEDED(parse_status)) { if (!DOT11F_SUCCEEDED(parse_status)) {
hdd_err("Invalid RSN IE: parse status %d", hdd_err("Invalid RSN IE: parse status %d",
@@ -5316,10 +5316,10 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
} }
/* Skip past the EID and length byte - and four byte WiFi OUI */ /* Skip past the EID and length byte - and four byte WiFi OUI */
rsn_ie = gen_ie + 2 + 4; rsn_ie = gen_ie + 2 + 4;
RSNIeLen = gen_ie_len - (2 + 4); rsn_ie_len = gen_ie_len - (2 + 4);
/* Unpack the WPA IE */ /* Unpack the WPA IE */
parse_status = dot11f_unpack_ie_wpa(MAC_CONTEXT(mac_handle), parse_status = dot11f_unpack_ie_wpa(MAC_CONTEXT(mac_handle),
rsn_ie, RSNIeLen, rsn_ie, rsn_ie_len,
&dot11WPAIE, false); &dot11WPAIE, false);
if (!DOT11F_SUCCEEDED(parse_status)) { if (!DOT11F_SUCCEEDED(parse_status)) {
hdd_err("Invalid WPA IE: parse status %d", hdd_err("Invalid WPA IE: parse status %d",

10
core/hdd/src/wlan_hdd_hostapd.c
View File

@@ -2692,7 +2692,7 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle,
{ {
uint32_t ret; uint32_t ret;
uint8_t *rsn_ie; uint8_t *rsn_ie;
uint16_t RSNIeLen, i; uint16_t rsn_ie_len, i;
tDot11fIERSN dot11RSNIE = {0}; tDot11fIERSN dot11RSNIE = {0};
tDot11fIEWPA dot11WPAIE = {0}; tDot11fIEWPA dot11WPAIE = {0};
@@ -2714,10 +2714,10 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle,
} }
/* Skip past the EID byte and length byte */ /* Skip past the EID byte and length byte */
rsn_ie = gen_ie + 2; rsn_ie = gen_ie + 2;
RSNIeLen = gen_ie_len - 2; rsn_ie_len = gen_ie_len - 2;
/* Unpack the RSN IE */ /* Unpack the RSN IE */
memset(&dot11RSNIE, 0, sizeof(tDot11fIERSN)); memset(&dot11RSNIE, 0, sizeof(tDot11fIERSN));
ret = sme_unpack_rsn_ie(mac_handle, rsn_ie, RSNIeLen, ret = sme_unpack_rsn_ie(mac_handle, rsn_ie, rsn_ie_len,
&dot11RSNIE, false); &dot11RSNIE, false);
if (DOT11F_FAILED(ret)) { if (DOT11F_FAILED(ret)) {
hdd_err("unpack failed, ret: 0x%x", ret); hdd_err("unpack failed, ret: 0x%x", ret);
@@ -2755,11 +2755,11 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle,
} }
/* Skip past the EID byte and length byte and 4 byte WiFi OUI */ /* Skip past the EID byte and length byte and 4 byte WiFi OUI */
rsn_ie = gen_ie + 2 + 4; rsn_ie = gen_ie + 2 + 4;
RSNIeLen = gen_ie_len - (2 + 4); rsn_ie_len = gen_ie_len - (2 + 4);
/* Unpack the WPA IE */ /* Unpack the WPA IE */
memset(&dot11WPAIE, 0, sizeof(tDot11fIEWPA)); memset(&dot11WPAIE, 0, sizeof(tDot11fIEWPA));
ret = dot11f_unpack_ie_wpa(MAC_CONTEXT(mac_handle), ret = dot11f_unpack_ie_wpa(MAC_CONTEXT(mac_handle),
rsn_ie, RSNIeLen, rsn_ie, rsn_ie_len,
&dot11WPAIE, false); &dot11WPAIE, false);
if (DOT11F_FAILED(ret)) { if (DOT11F_FAILED(ret)) {
hdd_err("unpack failed, ret: 0x%x", ret); hdd_err("unpack failed, ret: 0x%x", ret);