system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-09-06 09:04:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: branch 'lr/wwan-ppp-route-rh1585611'

Browse source 
https://github.com/NetworkManager/NetworkManager/pull/132
This commit is contained in:
Lubomir Rintel 2018-06-14 10:28:00 +02:00
parent 140ada3aad 650b5fd99e
commit 6373196ffd
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/devices/bluetooth/nm-device-bt.c
View file

@ -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);
}

2
src/devices/wwan/nm-device-modem.c
View file

@ -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);
}

13
src/devices/wwan/nm-modem.c
View file

@ -704,6 +704,8 @@ nm_modem_stage3_ip4_config_start (NMModem *self,
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_IP4_CONFIG);
/* Only Disabled and Auto methods make sense for WWAN */
@ -745,8 +747,6 @@ nm_modem_ip4_pre_commit (NMModem *modem,
{
NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (modem);
nm_modem_set_route_parameters_from_device (modem, device);
/* If the modem has an ethernet-type data interface (ie, not PPP and thus
* not point-to-point) and IP config has a /32 prefix, then we assume that
* ARP will be pointless and we turn it off.
@ -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 */

2
src/devices/wwan/nm-modem.h
View file

@ -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);