diff options
Diffstat (limited to 'src/core/ppp')
| -rw-r--r-- | src/core/ppp/nm-ppp-status.h | 2 | ||||
| -rw-r--r-- | src/core/ppp/nm-pppd-compat.c | 2 | ||||
| -rw-r--r-- | src/core/ppp/nm-pppd-plugin.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/ppp/nm-ppp-status.h b/src/core/ppp/nm-ppp-status.h index a2576e9c..9f7dab05 100644 --- a/src/core/ppp/nm-ppp-status.h +++ b/src/core/ppp/nm-ppp-status.h @@ -22,7 +22,7 @@ typedef enum { NM_PPP_STATUS_TERMINATE = 9, NM_PPP_STATUS_DISCONNECT = 10, NM_PPP_STATUS_HOLDOFF = 11, - NM_PPP_STATUS_MASTER = 12, + NM_PPP_STATUS_CONTROLLER = 12, /* these states are internal and not announced by the pppd plugin. */ NM_PPP_STATUS_INTERN_UNKNOWN = 20, diff --git a/src/core/ppp/nm-pppd-compat.c b/src/core/ppp/nm-pppd-compat.c index f7940c55..04e26f22 100644 --- a/src/core/ppp/nm-pppd-compat.c +++ b/src/core/ppp/nm-pppd-compat.c @@ -91,7 +91,7 @@ G_STATIC_ASSERT((gint64) NM_PPP_STATUS_RUNNING == PHASE_RUNNING); G_STATIC_ASSERT((gint64) NM_PPP_STATUS_TERMINATE == PHASE_TERMINATE); G_STATIC_ASSERT((gint64) NM_PPP_STATUS_DISCONNECT == PHASE_DISCONNECT); G_STATIC_ASSERT((gint64) NM_PPP_STATUS_HOLDOFF == PHASE_HOLDOFF); -G_STATIC_ASSERT((gint64) NM_PPP_STATUS_MASTER == PHASE_MASTER); +G_STATIC_ASSERT((gint64) NM_PPP_STATUS_CONTROLLER == PHASE_MASTER); G_STATIC_ASSERT(NM_PPPD_COMPAT_MAXNAMELEN == MAXNAMELEN); G_STATIC_ASSERT(NM_PPPD_COMPAT_MAXSECRETLEN == MAXSECRETLEN); diff --git a/src/core/ppp/nm-pppd-plugin.c b/src/core/ppp/nm-pppd-plugin.c index 93425f38..c8a866ec 100644 --- a/src/core/ppp/nm-pppd-plugin.c +++ b/src/core/ppp/nm-pppd-plugin.c @@ -73,8 +73,8 @@ nm_phasechange(int arg) case NM_PPP_STATUS_HOLDOFF: ppp_phase = "holdoff"; break; - case NM_PPP_STATUS_MASTER: - ppp_phase = "master"; + case NM_PPP_STATUS_CONTROLLER: + ppp_phase = "controller"; break; default: |