irmd: Fix the flow_join operationtestingbe

This fixes a regression in the code path for joining a broadcast
Layer. It deprecates the qos parameter on flow_join, as the QoS is
implied by the broadcast Layer itself.

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>

1 files changed, 2 insertions, 10 deletions

diff --git a/src/lib/dev.c b/src/lib/dev.c
index c0cd11a3..cb483aca 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -905,7 +905,6 @@ int flow_alloc(const char *            dst,
 }
 
 int flow_join(const char *            dst,
-              qosspec_t *             qs,
               const struct timespec * timeo)
 {
         struct flow_info flow;
@@ -914,16 +913,12 @@ int flow_join(const char *            dst,
         int              fd;
         int              err;
 
-#ifdef QOS_DISABLE_CRC
-        if (qs != NULL)
-                qs->ber = 1;
-#endif
         memset(&flow, 0, sizeof(flow));
 
         flow.n_pid = getpid();
-        flow.qs    = qs == NULL ? qos_raw : *qs;
+        flow.qs    = qos_np1;
 
-        if (flow_alloc__irm_req_ser(&msg, &flow, dst, timeo))
+        if (flow_join__irm_req_ser(&msg, &flow, dst, timeo))
                 return -ENOMEM;
 
         err = send_recv_msg(&msg);
@@ -936,9 +931,6 @@ int flow_join(const char *            dst,
 
         fd = flow_init(&flow, NULL);
 
-        if (qs != NULL)
-                *qs = flow.qs;
-
         return fd;
 }