diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-05-07 10:23:11 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-05-07 18:30:51 +0200 |
| commit | f1c3fa93d58429ea55a96c17e87837555ac7f766 (patch) | |
| tree | 1a899b6c0ab6ef052aa4e343778414d37ad9366a | |
| parent | 7eff55beeca451f6bd66587210a13810f1216f23 (diff) | |
| download | NetworkManager-lr/complete-conn.tar.gz | |
modem: use set conn.interface upon completing the CDMA connectionslr/complete-conn
There doesn't seem to be a better way to pinpoint a CDMA connection to a
device. This will have to do for now.
| -rw-r--r-- | src/devices/wwan/nm-device-modem.c | 6 | ||||
| -rw-r--r-- | src/devices/wwan/nm-modem-broadband.c | 3 | ||||
| -rw-r--r-- | src/devices/wwan/nm-modem.c | 3 | ||||
| -rw-r--r-- | src/devices/wwan/nm-modem.h | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c index 1e31628080..ec7cabea9b 100644 --- a/src/devices/wwan/nm-device-modem.c +++ b/src/devices/wwan/nm-device-modem.c @@ -499,7 +499,11 @@ complete_connection (NMDevice *device, { NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE ((NMDeviceModem *) device); - return nm_modem_complete_connection (priv->modem, connection, existing_connections, error); + return nm_modem_complete_connection (priv->modem, + nm_device_get_iface (device), + connection, + existing_connections, + error); } static void diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c index eeca8249d2..59e28a0d03 100644 --- a/src/devices/wwan/nm-modem-broadband.c +++ b/src/devices/wwan/nm-modem-broadband.c @@ -657,6 +657,7 @@ check_connection_compatible_with_modem (NMModem *_self, NMConnection *connection static gboolean complete_connection (NMModem *modem, + const char *iface, NMConnection *connection, NMConnection *const*existing_connections, GError **error) @@ -725,7 +726,7 @@ complete_connection (NMModem *modem, NULL, _("CDMA connection"), NULL, - NULL, + iface, FALSE); /* No IPv6 yet by default */ return TRUE; diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 1779422956..ca45e95ab2 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -1086,6 +1086,7 @@ nm_modem_check_connection_compatible (NMModem *self, NMConnection *connection, G gboolean nm_modem_complete_connection (NMModem *self, + const char *iface, NMConnection *connection, NMConnection *const*existing_connections, GError **error) @@ -1100,7 +1101,7 @@ nm_modem_complete_connection (NMModem *self, return FALSE; } - return klass->complete_connection (self, connection, existing_connections, error); + return klass->complete_connection (self, iface, connection, existing_connections, error); } /*****************************************************************************/ diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h index f7b6bfe959..6adc768aa5 100644 --- a/src/devices/wwan/nm-modem.h +++ b/src/devices/wwan/nm-modem.h @@ -130,6 +130,7 @@ typedef struct { GError **error); gboolean (*complete_connection) (NMModem *modem, + const char *iface, NMConnection *connection, NMConnection *const*existing_connections, GError **error); @@ -194,6 +195,7 @@ gboolean nm_modem_check_connection_compatible (NMModem *self, GError **error); gboolean nm_modem_complete_connection (NMModem *self, + const char *iface, NMConnection *connection, NMConnection *const*existing_connections, GError **error); |