diff options
Diffstat (limited to 'src/devices/wifi')
| -rw-r--r-- | src/devices/wifi/nm-device-iwd.c | 1 | ||||
| -rw-r--r-- | src/devices/wifi/nm-device-olpc-mesh.c | 53 | ||||
| -rw-r--r-- | src/devices/wifi/nm-device-wifi-p2p.c | 1 | ||||
| -rw-r--r-- | src/devices/wifi/nm-device-wifi.c | 1 |
4 files changed, 39 insertions, 17 deletions
diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c index 9cfe5f70..6ef9ef94 100644 --- a/src/devices/wifi/nm-device-iwd.c +++ b/src/devices/wifi/nm-device-iwd.c @@ -2061,6 +2061,7 @@ can_reapply_change (NMDevice *device, return nm_device_hash_check_invalid_keys (diffs, NM_SETTING_WIRELESS_SETTING_NAME, error, + NM_SETTING_WIRELESS_SEEN_BSSIDS, /* ignored */ NM_SETTING_WIRELESS_MTU); /* reapplied with IP config */ } diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index 3c865c55..aa50c420 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -82,9 +82,9 @@ get_autoconnect_allowed (NMDevice *device) NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (device); NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self); - /* We shall always have a companion if we're >= DISCONENCTED, and this - * ought not be called until then. */ - g_return_val_if_fail (priv->companion, FALSE); + /* We can't even connect if we don't have a companion yet. */ + if (!priv->companion) + return FALSE; /* We must not attempt to autoconnect when the companion is connected or * connecting, * because we'd tear down its connection. */ @@ -174,17 +174,28 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason) return NM_ACT_STAGE_RETURN_SUCCESS; } -static void +static gboolean _mesh_set_channel (NMDeviceOlpcMesh *self, guint32 channel) { NMPlatform *platform; int ifindex = nm_device_get_ifindex (NM_DEVICE (self)); + guint32 old_channel; platform = nm_device_get_platform (NM_DEVICE (self)); - if (nm_platform_mesh_get_channel (platform, ifindex) != channel) { - if (nm_platform_mesh_set_channel (platform, ifindex, channel)) - _notify (self, PROP_ACTIVE_CHANNEL); - } + old_channel = nm_platform_mesh_get_channel (platform, ifindex); + + if (channel == 0) + channel = old_channel; + + /* We want to call this even if the channel number is the same, + * because that actually starts the mesh with the configured mesh ID. */ + if (!nm_platform_mesh_set_channel (platform, ifindex, channel)) + return FALSE; + + if (old_channel != channel) + _notify (self, PROP_ACTIVE_CHANNEL); + + return TRUE; } static NMActStageReturn @@ -192,27 +203,35 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *out_failure_reason) { NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (device); NMSettingOlpcMesh *s_mesh; - guint32 channel; GBytes *ssid; const char *anycast_addr; + gboolean success; s_mesh = nm_device_get_applied_setting (device, NM_TYPE_SETTING_OLPC_MESH); g_return_val_if_fail (s_mesh, NM_ACT_STAGE_RETURN_FAILURE); - channel = nm_setting_olpc_mesh_get_channel (s_mesh); - if (channel != 0) - _mesh_set_channel (self, channel); - ssid = nm_setting_olpc_mesh_get_ssid (s_mesh); - nm_platform_mesh_set_ssid (nm_device_get_platform (device), - nm_device_get_ifindex (device), - g_bytes_get_data (ssid, NULL), - g_bytes_get_size (ssid)); + nm_device_take_down (NM_DEVICE (self), TRUE); + success = nm_platform_mesh_set_ssid (nm_device_get_platform (device), + nm_device_get_ifindex (device), + g_bytes_get_data (ssid, NULL), + g_bytes_get_size (ssid)); + nm_device_bring_up (NM_DEVICE (self), TRUE, NULL); + if (!success) { + _LOGW (LOGD_WIFI, "Unable to set the mesh ID"); + return NM_ACT_STAGE_RETURN_FAILURE; + } anycast_addr = nm_setting_olpc_mesh_get_dhcp_anycast_address (s_mesh); nm_device_set_dhcp_anycast_address (device, anycast_addr); + if (!_mesh_set_channel (self, nm_setting_olpc_mesh_get_channel (s_mesh))) { + _LOGW (LOGD_WIFI, "Unable to set the mesh channel"); + return NM_ACT_STAGE_RETURN_FAILURE; + } + + return NM_ACT_STAGE_RETURN_SUCCESS; } diff --git a/src/devices/wifi/nm-device-wifi-p2p.c b/src/devices/wifi/nm-device-wifi-p2p.c index c5826e24..c9e6189b 100644 --- a/src/devices/wifi/nm-device-wifi-p2p.c +++ b/src/devices/wifi/nm-device-wifi-p2p.c @@ -828,6 +828,7 @@ supplicant_group_iface_state_cb (NMSupplicantInterface *iface, static void supplicant_group_iface_group_finished_cb (NMSupplicantInterface *iface, + const char *iface_path, void *user_data) { NMDeviceWifiP2P *self = NM_DEVICE_WIFI_P2P (user_data); diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 2ffba47a..8c80b0aa 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -3254,6 +3254,7 @@ can_reapply_change (NMDevice *device, return nm_device_hash_check_invalid_keys (diffs, NM_SETTING_WIRELESS_SETTING_NAME, error, + NM_SETTING_WIRELESS_SEEN_BSSIDS, /* ignored */ NM_SETTING_WIRELESS_MTU, /* reapplied with IP config */ NM_SETTING_WIRELESS_WAKE_ON_WLAN); } |