summaryrefslogtreecommitdiff
path: root/src/ipcpd/shim-eth-llc/main.c
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-10-23 18:52:55 +0000
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-10-23 18:52:55 +0000
commit94573411a43ed2d2232bb9cf86998273c56cd249 (patch)
tree1e2740988654a4469676ac9779ae543db79ba33d /src/ipcpd/shim-eth-llc/main.c
parenta4889a6f1e9f3d3c6822c403ac4fa544618a8c34 (diff)
parent15bc37f3cbfc8df224854f5d988e0689ec7c94e0 (diff)
downloadouroboros-94573411a43ed2d2232bb9cf86998273c56cd249.tar.gz
ouroboros-94573411a43ed2d2232bb9cf86998273c56cd249.zip
Merged in dstaesse/ouroboros/be-shim-eth (pull request #275)
More fixes
Diffstat (limited to 'src/ipcpd/shim-eth-llc/main.c')
-rw-r--r--src/ipcpd/shim-eth-llc/main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c
index 3fc7eda5..6046d939 100644
--- a/src/ipcpd/shim-eth-llc/main.c
+++ b/src/ipcpd/shim-eth-llc/main.c
@@ -426,7 +426,7 @@ static int eth_llc_ipcp_flow_dealloc_req(uint8_t ssap)
if (fd < 0) {
pthread_rwlock_unlock(&eth_llc_data.flows_lock);
pthread_rwlock_unlock(&ipcpi.state_lock);
- LOG_ERR("No flow found for remote deallocation request.");
+ LOG_DBG("Flow already deallocated.");
return 0;
}
@@ -1009,10 +1009,9 @@ static int eth_llc_ipcp_flow_dealloc(int fd)
eth_llc_data.ef_to_fd[sap] = -1;
pthread_rwlock_unlock(&eth_llc_data.flows_lock);
-
- ret = eth_llc_ipcp_sap_dealloc(addr, r_sap);
pthread_rwlock_unlock(&ipcpi.state_lock);
+ ret = eth_llc_ipcp_sap_dealloc(addr, r_sap);
if (ret < 0)
LOG_DBG("Could not notify remote.");