summaryrefslogtreecommitdiff
path: root/src/ipcpd/normal/fmgr.c
diff options
context:
space:
mode:
authordimitri staessens <[email protected]>2016-12-06 14:32:09 +0000
committerdimitri staessens <[email protected]>2016-12-06 14:32:09 +0000
commitd257e862662f5692c5bdd922adf125a5c1f02e7e (patch)
tree6ec73e25c47506a653d972e96fd7be04c0f66592 /src/ipcpd/normal/fmgr.c
parent3068c438767fe54a1cced215e6df379a5c7ea8bf (diff)
parent38de1fd9af5a46c18ce5523b0c48e5f1c8679099 (diff)
downloadouroboros-d257e862662f5692c5bdd922adf125a5c1f02e7e.tar.gz
ouroboros-d257e862662f5692c5bdd922adf125a5c1f02e7e.zip
Merged in sandervrijders/ouroboros/be-operational-state (pull request #319)
ipcpd: Change IPCP_RUNNING to IPCP_OPERATIONAL
Diffstat (limited to 'src/ipcpd/normal/fmgr.c')
-rw-r--r--src/ipcpd/normal/fmgr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c
index 44b73627..41785ae4 100644
--- a/src/ipcpd/normal/fmgr.c
+++ b/src/ipcpd/normal/fmgr.c
@@ -130,7 +130,7 @@ static void * fmgr_nm1_acceptor(void * o)
(void) o;
while (true) {
- ipcp_wait_state(IPCP_RUNNING, NULL);
+ ipcp_wait_state(IPCP_OPERATIONAL, NULL);
pthread_rwlock_rdlock(&ipcpi.state_lock);
@@ -420,7 +420,7 @@ int fmgr_np1_alloc(int fd,
pthread_rwlock_rdlock(&ipcpi.state_lock);
- if (ipcp_get_state() != IPCP_RUNNING) {
+ if (ipcp_get_state() != IPCP_OPERATIONAL) {
pthread_rwlock_unlock(&ipcpi.state_lock);
LOG_ERR("IPCP is not enrolled yet.");
return -1; /* -ENOTINIT */