Merge pull request #11877 from sri-mohan1/sri-ldp-dbg1

[mirror_frr.git] / zebra / irdp_packet.c

diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c
index 6134df9c41565a0dd0eeb1f0eb329f86b0e677e9..c27d97ba71b572e0afdcbc854c00ce04253b81ae 100644 (file)
--- a/zebra/irdp_packet.c
+++ b/zebra/irdp_packet.c
@@ -54,7 +54,6 @@
 #include "zclient.h"
 #include "lib_errors.h"
 
-#include "zebra_memory.h"
 #include "zebra/interface.h"
 #include "zebra/rtadv.h"
 #include "zebra/rib.h"
@@ -225,7 +224,7 @@ static int irdp_recvmsg(int sock, uint8_t *buf, int size, int *ifindex)
        return ret;
 }
 
-int irdp_read_raw(struct thread *r)
+void irdp_read_raw(struct thread *r)
 {
        struct interface *ifp;
        struct zebra_if *zi;
@@ -234,7 +233,6 @@ int irdp_read_raw(struct thread *r)
        int ret, ifindex = 0;
 
        int irdp_sock = THREAD_FD(r);
-       t_irdp_raw = NULL;
        thread_add_read(zrouter.master, irdp_read_raw, NULL, irdp_sock,
                        &t_irdp_raw);
 
@@ -245,22 +243,22 @@ int irdp_read_raw(struct thread *r)
 
        ifp = if_lookup_by_index(ifindex, VRF_DEFAULT);
        if (!ifp)
-               return ret;
+               return;
 
        zi = ifp->info;
        if (!zi)
-               return ret;
+               return;
 
        irdp = zi->irdp;
        if (!irdp)
-               return ret;
+               return;
 
        if (!(irdp->flags & IF_ACTIVE)) {
 
                if (irdp->flags & IF_DEBUG_MISC)
                        zlog_debug("IRDP: RX ICMP for disabled interface %s",
                                   ifp->name);
-               return 0;
+               return;
        }
 
        if (irdp->flags & IF_DEBUG_PACKET) {
@@ -271,8 +269,6 @@ int irdp_read_raw(struct thread *r)
        }
 
        parse_irdp_packet(buf, ret, ifp);
-
-       return ret;
 }
 
 void send_packet(struct interface *ifp, struct stream *s, uint32_t dst,