diff options
| author | Sander Vrijders <[email protected]> | 2017-08-04 12:30:33 +0200 |
|---|---|---|
| committer | Sander Vrijders <[email protected]> | 2017-08-04 12:30:33 +0200 |
| commit | f85c70fdb6dbbadb903155120892e55b0eff5dda (patch) | |
| tree | cf80113aee8408b68f845ed7467cce3a8e5bb657 /src/ipcpd/shim-eth-llc/main.c | |
| parent | e77db148ce7adbaefb2ec7fb66a1fe0a36cff72f (diff) | |
| parent | 7729199645eb2c14d7b8a5329eb441f14fe7729f (diff) | |
| download | ouroboros-f85c70fdb6dbbadb903155120892e55b0eff5dda.tar.gz ouroboros-f85c70fdb6dbbadb903155120892e55b0eff5dda.zip | |
Merge branch 'testing' into be
Diffstat (limited to 'src/ipcpd/shim-eth-llc/main.c')
| -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, |