From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 8 Mar 2019 15:30:27 +0000 (-0500)
Subject: zebra: Remove duplicate NUD_PERMANENT check
X-Git-Tag: 7.1_pulled~190^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2ec19f003c8aff14dcef1256d1e914c659ae4002;p=matthieu%2Ffrr.git

zebra: Remove duplicate NUD_PERMANENT check

The check for an entry being NUD_PERMANENT has already been done
there is no need to do it twice.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 9cea1d3c79..32dc8791bc 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -2045,10 +2045,6 @@ static int netlink_macfdb_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 	 * so perform an implicit delete of any local entry (if it exists).
 	 */
 	if (h->nlmsg_type == RTM_NEWNEIGH) {
-		/* Drop "permanent" entries. */
-		if (ndm->ndm_state & NUD_PERMANENT)
-			return 0;
-
 		if (IS_ZEBRA_IF_VXLAN(ifp))
 			return zebra_vxlan_check_del_local_mac(ifp, br_if, &mac,
 							       vid);