fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 23:10:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: drop extra conditions in nm_wifi_utils_parse_ies() and use NM_SET_OUT()

Browse source 
NM_SET_OUT() macro already has an "if" condition to only do
anything if the output pointer is not NULL.

As such, we don't need to check first. In practice, this only reorders
the checks, which the compiler may anyway do.

Note that above the checks are still relevant, because we want to
avoid the more expensive parsing, if we don't care about the result.
This commit is contained in:
Thomas Haller 2020-05-12 14:37:01 +02:00
parent b7a2e73bd2
commit 1c216ca3be
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/nm-core-utils.c
View file

@ -4446,21 +4446,18 @@ nm_wifi_utils_parse_ies (const guint8 *bytes,
}
break;
case WLAN_EID_VENDOR_SPECIFIC:
if (out_metered) {
if ( len == 8
&& bytes[0] == 0x00 /* OUI: Microsoft */
&& bytes[1] == 0x50
&& bytes[2] == 0xf2
&& bytes[3] == 0x11) /* OUI type: Network cost */
*out_metered = (bytes[7] > 1); /* Cost level > 1 */
}
if ( out_owe_transition_mode
&& elem_len >= 10
if ( len == 8
&& bytes[0] == 0x00 /* OUI: Microsoft */
&& bytes[1] == 0x50
&& bytes[2] == 0xf2
&& bytes[3] == 0x11) /* OUI type: Network cost */
NM_SET_OUT (out_metered, (bytes[7] > 1)); /* Cost level > 1 */
if ( elem_len >= 10
&& bytes[0] == 0x50 /* OUI: WiFi Alliance */
&& bytes[1] == 0x6f
&& bytes[2] == 0x9a
&& bytes[3] == 0x1c) /* OUI type: OWE Transition Mode */
*out_owe_transition_mode = TRUE;
NM_SET_OUT (out_owe_transition_mode, TRUE);
break;
}