summaryrefslogtreecommitdiff
path: root/src/ipcpd/normal/fmgr.c
diff options
context:
space:
mode:
authordimitri staessens <[email protected]>2016-08-08 14:34:12 +0200
committerdimitri staessens <[email protected]>2016-08-08 14:34:12 +0200
commit3220cd99c42f08bbd959cf73b9fc7b3ca8375676 (patch)
treeae9898536ee5767080b39e82806804fbf9911605 /src/ipcpd/normal/fmgr.c
parent3c80fae407f451691a4a4178617986e32d0c8162 (diff)
parentd13a6dfd0f7a8ebc98cdb59cf0a04a282fa1593d (diff)
downloadouroboros-3220cd99c42f08bbd959cf73b9fc7b3ca8375676.tar.gz
ouroboros-3220cd99c42f08bbd959cf73b9fc7b3ca8375676.zip
Merged in sandervrijders/ouroboros/be-enroll (pull request #189)
ipcpd: normal: Allow exchange of static DIF information
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 a539b289..f9de16c4 100644
--- a/src/ipcpd/normal/fmgr.c
+++ b/src/ipcpd/normal/fmgr.c
@@ -82,8 +82,8 @@ static void * fmgr_listen(void * o)
/* FIXME: Avoid busy wait and react to pthread_cond_t */
pthread_rwlock_rdlock(&_ipcp->state_lock);
- while (_ipcp->state != IPCP_ENROLLED ||
- _ipcp->state != IPCP_SHUTDOWN) {
+ while (!(_ipcp->state == IPCP_ENROLLED ||
+ _ipcp->state == IPCP_SHUTDOWN)) {
pthread_rwlock_unlock(&_ipcp->state_lock);
sched_yield();
pthread_rwlock_rdlock(&_ipcp->state_lock);