diff options
| author | dimitri staessens <[email protected]> | 2017-09-13 09:41:41 +0000 |
|---|---|---|
| committer | Sander Vrijders <[email protected]> | 2017-09-13 09:41:41 +0000 |
| commit | 888d3dbe7c3844d2efe9d6bc9823630db5d47a3b (patch) | |
| tree | ed79946a5ff22267857cd6d5a864d15339c942a1 /src/ipcpd/normal/fa.c | |
| parent | 2e4cdc1f680d5ee9086adac76acebdec3bd1da3f (diff) | |
| parent | 45c6615484ffe347654c34decb72ff1ef9bde0f3 (diff) | |
| download | ouroboros-888d3dbe7c3844d2efe9d6bc9823630db5d47a3b.tar.gz ouroboros-888d3dbe7c3844d2efe9d6bc9823630db5d47a3b.zip | |
Merged in dstaesse/ouroboros/be-rib-removal (pull request #589)
ipcpd: Revise internals of normal IPCP
Diffstat (limited to 'src/ipcpd/normal/fa.c')
| -rw-r--r-- | src/ipcpd/normal/fa.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/ipcpd/normal/fa.c b/src/ipcpd/normal/fa.c index 682dc5c6..e684abd2 100644 --- a/src/ipcpd/normal/fa.c +++ b/src/ipcpd/normal/fa.c @@ -28,7 +28,6 @@ #include <ouroboros/logs.h> #include <ouroboros/fqueue.h> -#include <ouroboros/rib.h> #include <ouroboros/errno.h> #include <ouroboros/dev.h> #include <ouroboros/ipcp-dev.h> @@ -38,7 +37,6 @@ #include "fa.h" #include "sdu_sched.h" #include "ipcp.h" -#include "ribconfig.h" #include "dt.h" #include <pthread.h> @@ -59,9 +57,9 @@ struct { struct sdu_sched * sdu_sched; } fa; -static int sdu_handler(int fd, - qoscube_t qc, - struct shm_du_buff * sdb) +static void sdu_handler(int fd, + qoscube_t qc, + struct shm_du_buff * sdb) { pthread_rwlock_rdlock(&fa.flows_lock); @@ -69,12 +67,10 @@ static int sdu_handler(int fd, pthread_rwlock_unlock(&fa.flows_lock); ipcp_sdb_release(sdb); log_warn("Failed to forward SDU."); - return -1; + return; } pthread_rwlock_unlock(&fa.flows_lock); - - return 0; } static void destroy_conn(int fd) |