Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-23 06:02:37 +01:00
Code Releases Activity

station: replace station_parse_bss_security

Browse Source 
Replaces this with scan_bss_get_security
This commit is contained in:
James Prestwood 2022-02-24 09:04:55 -08:00 committed by Denis Kenzior
parent 27bf997545
commit 9224575a83
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/station.c
View File

@ -346,25 +346,6 @@ static int bss_signal_strength_compare(const void *a, const void *b, void *user)
return (bss->signal_strength > new_bss->signal_strength) ? 1 : -1; return (bss->signal_strength > new_bss->signal_strength) ? 1 : -1;
} }
static int station_parse_bss_security(struct station *station,
struct scan_bss *bss,
enum security *security_out)
{
struct ie_rsn_info info;
int r;
r = scan_bss_get_rsn_info(bss, &info);
if (r < 0) {
if (r != -ENOENT)
return r;
*security_out = security_determine(bss->capability, NULL);
} else
*security_out = security_determine(bss->capability, &info);
return 0;
}
/* /*
* Returns the network object the BSS was added to or NULL if ignored. * Returns the network object the BSS was added to or NULL if ignored.
*/ */
@ -400,7 +381,7 @@ static struct network *station_add_seen_bss(struct station *station,
return NULL; return NULL;
} }
if (station_parse_bss_security(station, bss, &security) < 0) if (scan_bss_get_security(bss, &security) < 0)
return NULL; return NULL;
/* Hidden OWE transition network */ /* Hidden OWE transition network */
@ -2341,7 +2322,7 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list,
memcmp(bss->ssid, hs->ssid, hs->ssid_len)) memcmp(bss->ssid, hs->ssid, hs->ssid_len))
goto next; goto next;
if (station_parse_bss_security(station, bss, &security) < 0) if (scan_bss_get_security(bss, &security) < 0)
goto next; goto next;
if (security != orig_security) if (security != orig_security)
@ -3483,7 +3464,7 @@ static struct l_dbus_message *station_dbus_get_hidden_access_points(
int16_t signal_strength = bss->signal_strength; int16_t signal_strength = bss->signal_strength;
enum security security; enum security security;
if (station_parse_bss_security(station, bss, &security) < 0) if (scan_bss_get_security(bss, &security) < 0)
continue; continue;
l_dbus_message_builder_enter_struct(builder, "sns"); l_dbus_message_builder_enter_struct(builder, "sns");
@ -4250,7 +4231,7 @@ static struct network *station_find_network_from_bss(struct station *station,
memcpy(ssid, bss->ssid, bss->ssid_len); memcpy(ssid, bss->ssid, bss->ssid_len);
ssid[bss->ssid_len] = '\0'; ssid[bss->ssid_len] = '\0';
if (station_parse_bss_security(station, bss, &security) < 0) if (scan_bss_get_security(bss, &security) < 0)
return NULL; return NULL;
return station_network_find(station, ssid, security); return station_network_find(station, ssid, security);