diff options
| author | Michael Biebl <biebl@debian.org> | 2012-03-24 01:37:02 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-03-24 01:37:02 +0100 |
| commit | 6d09564a44846697e1b2a4d50fc5272834c33ed9 (patch) | |
| tree | 562300c45bf4c7d09a2903ccdf1c4d1647989725 /src/modem-manager/nm-modem.h | |
| parent | 1ac8eb294d0f5e38bd08f709047a73e24a5a4dd3 (diff) | |
| parent | de06e5715e780baade318f3490ac7a4c9ce84e32 (diff) | |
Merge tag 'upstream/0.9.4.0'
Upstream version 0.9.4.0
Diffstat (limited to 'src/modem-manager/nm-modem.h')
| -rw-r--r-- | src/modem-manager/nm-modem.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modem-manager/nm-modem.h b/src/modem-manager/nm-modem.h index bad19b04..8fe52bc0 100644 --- a/src/modem-manager/nm-modem.h +++ b/src/modem-manager/nm-modem.h @@ -40,6 +40,7 @@ G_BEGIN_DECLS #define NM_MODEM_DEVICE "device" #define NM_MODEM_IFACE "iface" #define NM_MODEM_IP_METHOD "ip-method" +#define NM_MODEM_IP_TIMEOUT "ip-timeout" #define NM_MODEM_ENABLED "enabled" #define NM_MODEM_PPP_STATS "ppp-stats" @@ -129,11 +130,10 @@ NMActStageReturn nm_modem_stage3_ip4_config_start (NMModem *modem, NMDeviceClass *device_class, NMDeviceStateReason *reason); -NMActStageReturn nm_modem_stage4_get_ip4_config (NMModem *modem, - NMDevice *device, - NMDeviceClass *device_class, - NMIP4Config **config, - NMDeviceStateReason *reason); +NMActStageReturn nm_modem_stage3_ip6_config_start (NMModem *modem, + NMDevice *device, + NMDeviceClass *device_class, + NMDeviceStateReason *reason); gboolean nm_modem_get_secrets (NMModem *modem, const char *setting_name, |