colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi/olpc-mesh: drop assert(companion) from get_autoconnect_allowed()

Browse Source 
The comment is wrong. Since 6eaded9071 ('device: add
get_autoconnect_allowed() virtual function'), get_autoconnect_allowed()
is called before the device state is consulted.
This commit is contained in:
Lubomir Rintel
2019-09-05 13:51:30 +02:00
parent cc96771f32
commit ad86ee4d48
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/wifi/nm-device-olpc-mesh.c
View File

@@ -82,9 +82,9 @@ get_autoconnect_allowed (NMDevice *device)
NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (device); NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (device);
NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self); NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self);
/* We shall always have a companion if we're >= DISCONENCTED, and this /* We can't even connect if we don't have a companion yet. */
* ought not be called until then. */ if (!priv->companion)
g_return_val_if_fail (priv->companion, FALSE); return FALSE;
/* We must not attempt to autoconnect when the companion is connected or /* We must not attempt to autoconnect when the companion is connected or
* connecting, * because we'd tear down its connection. */ * connecting, * because we'd tear down its connection. */