diff options
author | dimitri staessens <dimitri.staessens@ugent.be> | 2017-08-04 10:29:56 +0000 |
---|---|---|
committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-08-04 10:29:56 +0000 |
commit | 7729199645eb2c14d7b8a5329eb441f14fe7729f (patch) | |
tree | 5c046925f2af509f2a2db255562fad418a3271a0 /src/ipcpd | |
parent | 9017e3006c1e1246de5291f13319a763fd440e2f (diff) | |
parent | 0fe8d5aa50fcadc3b4eef65b2833944a76eb8f3e (diff) | |
download | ouroboros-7729199645eb2c14d7b8a5329eb441f14fe7729f.tar.gz ouroboros-7729199645eb2c14d7b8a5329eb441f14fe7729f.zip |
Merged in dstaesse/ouroboros/testing-irmd (pull request #541)
irmd: Release lock before ipcp_query
Diffstat (limited to 'src/ipcpd')
-rw-r--r-- | src/ipcpd/shim-eth-llc/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c index 4899cd83..dcbbc047 100644 --- a/src/ipcpd/shim-eth-llc/main.c +++ b/src/ipcpd/shim-eth-llc/main.c @@ -1037,7 +1037,7 @@ static int eth_llc_ipcp_flow_alloc_resp(int fd, pthread_mutex_lock(&ipcpi.alloc_lock); - while (ipcpi.alloc_id != fd && ipcp_get_state() == IPCP_OPERATIONAL){ + while (ipcpi.alloc_id != fd && ipcp_get_state() == IPCP_OPERATIONAL) { ts_add(&abstime, &ts, &abstime); pthread_cond_timedwait(&ipcpi.alloc_cond, &ipcpi.alloc_lock, |