diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-06-11 12:58:21 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-06-13 16:56:51 +0200 |
| commit | 650b5fd99e31f9fed74f0600f9613883d3c547ed (patch) | |
| tree | eb106c339a4501a42ef7ae9c46b79fcda72f5c2a | |
| parent | 267948f2b7f677f9dd8ced5f5f6755c6694cfcab (diff) | |
| download | NetworkManager-lr/wwan-ppp-route-rh1585611.tar.gz | |
wwan: ensure the route parameters are set on IPv6 only configurationlr/wwan-ppp-route-rh1585611
| -rw-r--r-- | src/devices/bluetooth/nm-device-bt.c | 7 | ||||
| -rw-r--r-- | src/devices/wwan/nm-device-modem.c | 2 | ||||
| -rw-r--r-- | src/devices/wwan/nm-modem.c | 9 | ||||
| -rw-r--r-- | src/devices/wwan/nm-modem.h | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index 1d237d9277..92ad0b31cc 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -903,11 +903,8 @@ act_stage3_ip6_config_start (NMDevice *device, { NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE ((NMDeviceBt *) device); - if (priv->bt_type == NM_BT_CAPABILITY_DUN) { - return nm_modem_stage3_ip6_config_start (priv->modem, - nm_device_get_act_request (device), - out_failure_reason); - } + if (priv->bt_type == NM_BT_CAPABILITY_DUN) + return nm_modem_stage3_ip6_config_start (priv->modem, device, out_failure_reason); return NM_DEVICE_CLASS (nm_device_bt_parent_class)->act_stage3_ip6_config_start (device, out_config, out_failure_reason); } diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c index 2a3e9ebeb7..352b1c3e8b 100644 --- a/src/devices/wwan/nm-device-modem.c +++ b/src/devices/wwan/nm-device-modem.c @@ -542,7 +542,7 @@ act_stage3_ip6_config_start (NMDevice *device, NMDeviceStateReason *out_failure_reason) { return nm_modem_stage3_ip6_config_start (NM_DEVICE_MODEM_GET_PRIVATE ((NMDeviceModem *) device)->modem, - nm_device_get_act_request (device), + device, out_failure_reason); } diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index d018b4e5fe..ff1579d102 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -804,20 +804,25 @@ stage3_ip6_config_request (NMModem *self, NMDeviceStateReason *out_failure_reaso NMActStageReturn nm_modem_stage3_ip6_config_start (NMModem *self, - NMActRequest *req, + NMDevice *device, NMDeviceStateReason *out_failure_reason) { NMModemPrivate *priv; + NMActRequest *req; NMActStageReturn ret; NMConnection *connection; const char *method; g_return_val_if_fail (NM_IS_MODEM (self), NM_ACT_STAGE_RETURN_FAILURE); - g_return_val_if_fail (NM_IS_ACT_REQUEST (req), NM_ACT_STAGE_RETURN_FAILURE); + + req = nm_device_get_act_request (device); + g_return_val_if_fail (req, NM_ACT_STAGE_RETURN_FAILURE); connection = nm_act_request_get_applied_connection (req); g_return_val_if_fail (connection, NM_ACT_STAGE_RETURN_FAILURE); + nm_modem_set_route_parameters_from_device (self, device); + method = nm_utils_get_ip_config_method (connection, NM_TYPE_SETTING_IP6_CONFIG); /* Only Ignore and Auto methods make sense for WWAN */ diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h index 3e281c0c92..6e78d2d5d7 100644 --- a/src/devices/wwan/nm-modem.h +++ b/src/devices/wwan/nm-modem.h @@ -221,7 +221,7 @@ NMActStageReturn nm_modem_stage3_ip4_config_start (NMModem *modem, NMDeviceStateReason *out_failure_reason); NMActStageReturn nm_modem_stage3_ip6_config_start (NMModem *modem, - NMActRequest *req, + NMDevice *device, NMDeviceStateReason *out_failure_reason); void nm_modem_ip4_pre_commit (NMModem *modem, NMDevice *device, NMIP4Config *config); |