From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Fri, 8 Mar 2019 18:35:04 +0000 (+0000)
Subject: Revert "Revert "vrrpd: protodown mvlans when shutting down""
X-Git-Tag: base_7.2~330^2~33
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=4d2ea6bf2860039123aca3437365fe9f65e4ba7d;p=matthieu%2Ffrr.git

Revert "Revert "vrrpd: protodown mvlans when shutting down""

Now that the requirement of knowing our VRRP IPv6 primary address in
advance is lifted, it's no problem for us that the macvlans could be
down when we get them. We can handle this in both the v4 and v6 case
now, so we don't need to behave as if they should always be left up.

This reverts commit 6eae67dabcbc31a2117ce3847c18ac52b3b76b1e.
---

diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c
index 6262cd692f..cba79b544e 100644
--- a/vrrpd/vrrp.c
+++ b/vrrpd/vrrp.c
@@ -1555,6 +1555,9 @@ static int vrrp_shutdown(struct vrrp_router *r)
 	THREAD_OFF(r->t_read);
 	THREAD_OFF(r->t_write);
 
+	/* Protodown macvlan */
+	vrrp_zclient_send_interface_protodown(r->mvl_ifp, true);
+
 	if (r->sock_rx > 0) {
 		close(r->sock_rx);
 		r->sock_rx = -1;