summaryrefslogtreecommitdiff
path: root/src/lib/dev.c
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-12-24 12:54:16 +0100
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-12-24 12:54:16 +0100
commit7348a7d587adc3cb1bc11ef7513ef7b03bc40349 (patch)
tree54c4406c135621d44fd9468c12a6b26e3e5d4f74 /src/lib/dev.c
parent55eaed508c9f68b350f29cf2c4e96be4e57b0b37 (diff)
parent8910bd28e2b6269f0900c8215352ab5d177a3b54 (diff)
downloadouroboros-7348a7d587adc3cb1bc11ef7513ef7b03bc40349.tar.gz
ouroboros-7348a7d587adc3cb1bc11ef7513ef7b03bc40349.zip
Merged in dstaesse/ouroboros/be-normal (pull request #325)
Be normal
Diffstat (limited to 'src/lib/dev.c')
-rw-r--r--src/lib/dev.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/dev.c b/src/lib/dev.c
index bad56129..20976375 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -134,7 +134,7 @@ struct flow {
struct shm_flow_set * set;
int port_id;
int oflags;
- enum qos_cube qos;
+ qoscube_t qos;
pid_t api;
@@ -654,9 +654,8 @@ int flow_dealloc(int fd)
pthread_rwlock_unlock(&ai.data_lock);
recv_msg = send_recv_irm_msg_b(&msg);
- if (recv_msg == NULL) {
+ if (recv_msg == NULL)
return -1;
- }
if (!recv_msg->has_result) {
irm_msg__free_unpacked(recv_msg, NULL);
@@ -1435,11 +1434,10 @@ int ipcp_flow_fini(int fd)
pthread_rwlock_unlock(&ai.data_lock);
shm_rbuff_fini(rb);
-
return 0;
}
-int ipcp_flow_get_qoscube(int fd, enum qos_cube * cube)
+int ipcp_flow_get_qoscube(int fd, qoscube_t * cube)
{
if (fd < 0 || fd >= AP_MAX_FLOWS || cube == NULL)
return -EINVAL;