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

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.

(cherry picked from commit ad86ee4d48)
This commit is contained in:
Lubomir Rintel 2019-09-05 13:51:30 +02:00
parent 15e813deff
commit b6d7e44bd8
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-olpc-mesh.c
View file

@ -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. */