diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-01-10 17:32:35 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-02-21 20:28:46 +0100 |
| commit | 352d063009cdf4bfbff0064c66c63fc48e876340 (patch) | |
| tree | 5127533102598d267185becca0ad080a9c9a901d | |
| parent | 41e80a02b25391eb1c11047ef2755ddad014bc47 (diff) | |
| download | NetworkManager-352d063009cdf4bfbff0064c66c63fc48e876340.tar.gz | |
wwan/trivial: rename internal variable ppp_iface to ip_iface
This is really the name of the networking device. Whether it
is created by ppp is not that important here. Rename.
| -rw-r--r-- | src/devices/wwan/nm-modem.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 7adaca798b..98208fe449 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -79,7 +79,7 @@ typedef struct _NMModemPrivate { char *driver; char *control_port; char *data_port; - char *ppp_iface; + char *ip_iface; NMModemIPMethod ip4_method; NMModemIPMethod ip6_method; NMUtilsIPv6IfaceId iid; @@ -1128,7 +1128,7 @@ deactivate_cleanup (NMModem *self, NMDevice *device) priv->ip4_method = NM_MODEM_IP_METHOD_UNKNOWN; priv->ip6_method = NM_MODEM_IP_METHOD_UNKNOWN; - nm_clear_g_free (&priv->ppp_iface); + nm_clear_g_free (&priv->ip_iface); } /*****************************************************************************/ @@ -1388,11 +1388,11 @@ nm_modem_get_data_port (NMModem *self) priv = NM_MODEM_GET_PRIVATE (self); - /* The ppp_iface takes precedence over the data interface when PPP is used, + /* The ip_iface takes precedence over the data interface when PPP is used, * since data_iface is the TTY over which PPP is run, and that TTY can't * do IP. The caller really wants the thing that's doing IP. */ - return priv->ppp_iface ?: priv->data_port; + return priv->ip_iface ?: priv->data_port; } gboolean @@ -1406,7 +1406,7 @@ nm_modem_owns_port (NMModem *self, const char *iface) return NM_MODEM_GET_CLASS (self)->owns_port (self, iface); return NM_IN_STRSET (iface, - priv->ppp_iface, + priv->ip_iface, priv->data_port, priv->control_port); } @@ -1671,7 +1671,7 @@ finalize (GObject *object) g_free (priv->driver); g_free (priv->control_port); g_free (priv->data_port); - g_free (priv->ppp_iface); + g_free (priv->ip_iface); g_free (priv->device_id); g_free (priv->sim_id); g_free (priv->sim_operator_id); |