diff options
author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-01-11 19:31:46 +0100 |
---|---|---|
committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-01-31 15:20:46 +0100 |
commit | 3801e7646c73b4b0122ea02eb35e8d39c3796c95 (patch) | |
tree | 1cc94938f78745afc8f83b506efc93d6eb9a4f49 /zebra/irdp_packet.c | |
parent | Merge pull request #3699 from donaldsharp/zebra_rib_debugs (diff) | |
download | frr-3801e7646c73b4b0122ea02eb35e8d39c3796c95.tar.xz frr-3801e7646c73b4b0122ea02eb35e8d39c3796c95.zip |
zebra: Move the master thread handler to the zrouter structure
The master thread handler is really part of the zrouter structure.
So let's move it over to that. Eventually zserv.h will only be
used for zapi messages.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/irdp_packet.c')
-rw-r--r-- | zebra/irdp_packet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c index bebccd716..774d84d66 100644 --- a/zebra/irdp_packet.c +++ b/zebra/irdp_packet.c @@ -58,7 +58,7 @@ #include "zebra/interface.h" #include "zebra/rtadv.h" #include "zebra/rib.h" -#include "zebra/zserv.h" +#include "zebra/zebra_router.h" #include "zebra/redistribute.h" #include "zebra/irdp.h" #include "zebra/zebra_errors.h" @@ -230,7 +230,7 @@ int irdp_read_raw(struct thread *r) int irdp_sock = THREAD_FD(r); t_irdp_raw = NULL; - thread_add_read(zebrad.master, irdp_read_raw, NULL, irdp_sock, + thread_add_read(zrouter.master, irdp_read_raw, NULL, irdp_sock, &t_irdp_raw); ret = irdp_recvmsg(irdp_sock, (uint8_t *)buf, IRDP_RX_BUF, &ifindex); |