diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2018-12-10 18:50:07 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2018-12-10 21:58:19 +0100 |
| commit | e335b8ae803a5a0f28a692edc0349ababa490445 (patch) | |
| tree | 753f3d62d0aaa2ab6a831f8dcfa525d714868d0c /src/devices/wifi | |
| parent | 69385b013384918a005052098d5beae003b4c8d3 (diff) | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
Import Debian changes 1.12.6-0ubuntu1
network-manager (1.12.6-0ubuntu1) disco; urgency=medium
* New upstream version
- Fix a vulnerability in the internal DHCPv6 client (CVE-2018-15688).
* debian/patches/git_mac_change.patch:
- backported a regression fix from upstream git
[ Alfonso Sanchez-Beato ]
* Import some WoWLAN patches from the newer stable serie (LP: #1781597)
Diffstat (limited to 'src/devices/wifi')
| -rw-r--r-- | src/devices/wifi/nm-device-olpc-mesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index fd7bf3f7..97a81bf4 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -302,7 +302,7 @@ companion_state_changed_cb (NMDeviceWifi *companion, } static gboolean -companion_scan_prohibited_cb (NMDeviceWifi *companion, gpointer user_data) +companion_scan_prohibited_cb (NMDeviceWifi *companion, gboolean periodic, gpointer user_data) { NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (user_data); NMDeviceState state = nm_device_get_state (NM_DEVICE (self)); @@ -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); } } |