summaryrefslogtreecommitdiff
path: root/src/ipcpd/shim-eth-llc/main.c
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-10-24 16:41:27 +0200
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-10-24 16:41:27 +0200
commitf33f8f79ee6fd6efe6c868be61ab3addf2ec2730 (patch)
treeab571093282b69ff1acfb13ea33428c2843c2b2f /src/ipcpd/shim-eth-llc/main.c
parentf9aecc005360388cfebd625925e9219aa27c3466 (diff)
parentb05290df28e380ddc789fd5e7eada95e9adef389 (diff)
downloadouroboros-f33f8f79ee6fd6efe6c868be61ab3addf2ec2730.tar.gz
ouroboros-f33f8f79ee6fd6efe6c868be61ab3addf2ec2730.zip
Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be
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.");