fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-01 07:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device/wifi: fix handling static WEP connections in act_stage4_ip_config_timeout()

Browse source 
Fixes: 5e71f01605 ('device: merge stage3 and stage4 ip-config function for IPv4 and IPv6')
This commit is contained in:
Thomas Haller 2019-03-15 15:27:41 +01:00
parent d867837d05
commit fd2106dbd6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/devices/wifi/nm-device-wifi.c
View file

@ -2942,14 +2942,14 @@ act_stage4_ip_config_timeout (NMDevice *device,
gboolean may_fail; gboolean may_fail;
connection = nm_device_get_applied_connection (device); connection = nm_device_get_applied_connection (device);
s_ip = nm_connection_get_setting_ip4_config (connection); s_ip = nm_connection_get_setting_ip_config (connection, addr_family);
may_fail = nm_setting_ip_config_get_may_fail (s_ip); may_fail = nm_setting_ip_config_get_may_fail (s_ip);
if (priv->mode == NM_802_11_MODE_AP) if (priv->mode == NM_802_11_MODE_AP)
goto call_parent; goto call_parent;
if ( may_fail if ( may_fail
&& !is_static_wep (connection)) { || !is_static_wep (connection)) {
/* Not static WEP or failure allowed; let superclass handle it */ /* Not static WEP or failure allowed; let superclass handle it */
goto call_parent; goto call_parent;
} }
@ -2961,7 +2961,7 @@ act_stage4_ip_config_timeout (NMDevice *device,
* types (open, WPA, 802.1x, etc) if the secrets/certs were wrong the * types (open, WPA, 802.1x, etc) if the secrets/certs were wrong the
* connection would have failed before IP configuration. * connection would have failed before IP configuration.
* *
* Activation failed, we must have bad encryption key */ * Activation failed, we must have bad encryption key */
_LOGW (LOGD_DEVICE | LOGD_WIFI, _LOGW (LOGD_DEVICE | LOGD_WIFI,
"Activation: (wifi) could not get IP configuration for connection '%s'.", "Activation: (wifi) could not get IP configuration for connection '%s'.",
nm_connection_get_id (connection)); nm_connection_get_id (connection));