diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-08-30 07:47:53 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-09-22 16:05:50 +0200 |
| commit | d6df0339ff3d3129d0a36d2d82bef82a3088cb38 (patch) | |
| tree | 4610809646815e2ccb3568d825840fe028cd6711 /src/devices/wwan/nm-modem.c | |
| parent | f796be3d7dcda422fd56fddf5d721f99e7e7a871 (diff) | |
| download | NetworkManager-d6df0339ff3d3129d0a36d2d82bef82a3088cb38.tar.gz | |
wwan: simplify API of nm_modem_act_stage2_config() to never fail
The previous function arguments of nm_modem_act_stage2_config() act as if the
function could fail or even postpone the action. It never did.
We cannot treat this generic. A caller needs to know whether nm_modem_act_stage2_config()
can postpone the action, and when it does, which signal is emitted upon completion. That
is, the caller needs to know how to proceed after postponing.
In other words, since this function currently cannot fail or postpone
the stage, so must all callers already rely on that. At this point it makes
no sense to pretend that the function could be any different, if all callers
assume it is not. Simplify the API.
Diffstat (limited to 'src/devices/wwan/nm-modem.c')
| -rw-r--r-- | src/devices/wwan/nm-modem.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index e8109628b3..32490da1a6 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -1063,10 +1063,8 @@ nm_modem_act_stage1_prepare (NMModem *self, /*****************************************************************************/ -NMActStageReturn -nm_modem_act_stage2_config (NMModem *self, - NMActRequest *req, - NMDeviceStateReason *out_failure_reason) +void +nm_modem_act_stage2_config (NMModem *self) { NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self); @@ -1074,8 +1072,6 @@ nm_modem_act_stage2_config (NMModem *self, * already if we get here. */ priv->secrets_tries = 0; - - return NM_ACT_STAGE_RETURN_SUCCESS; } /*****************************************************************************/ |