From 391e298dfb9bd2a41318eb666f31b5a8d52cdb3e Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 11 Oct 2018 23:08:11 +0200 Subject: [PATCH] devices/olpc: don't assert we're waiting for companion on device_added_cb() We're hooking the signal on construction, but we only queue a pending action on reaching UNAVAILABLE state. The signal could fire in between: [1539282167.9666] manager: (msh0): new 802.11 OLPC Mesh device (/org/freedesktop/NetworkManager/Devices/4) [1539282168.1440] manager: (wlan0): new 802.11 WiFi device (/org/freedesktop/NetworkManager/Devices/5) [1539282168.1831] device (msh0): found companion WiFi device wlan0 [1539282168.2110] device (msh0): remove_pending_action (1): 'waiting-for-companion' not pending file src/devices/nm-device.c: line 13966 (): should not be reached https://github.com/NetworkManager/NetworkManager/pull/229 (cherry picked from commit 08225c5e966ccd867adc93431b3e1ccb8e776178) (cherry picked from commit 7e793bf3b4ad981d3899b7d57af9c9229d2b0d6f) --- src/devices/wifi/nm-device-olpc-mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index 373bc06125..97a81bf411 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -369,7 +369,7 @@ device_added_cb (NMManager *manager, NMDevice *other, gpointer user_data) nm_device_queue_recheck_available (NM_DEVICE (self), NM_DEVICE_STATE_REASON_NONE, NM_DEVICE_STATE_REASON_NONE); - nm_device_remove_pending_action (NM_DEVICE (self), NM_PENDING_ACTION_WAITING_FOR_COMPANION, TRUE); + nm_device_remove_pending_action (NM_DEVICE (self), NM_PENDING_ACTION_WAITING_FOR_COMPANION, FALSE); } }