1 files changed, 35 insertions, 31 deletions

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 547700d0c5..1cae0b1f9b 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -77,16 +77,7 @@
 /* Re-defining as I am unable to include <linux/if_bridge.h> which has the
  * UAPI for MAC sync. */
 #ifndef _UAPI_LINUX_IF_BRIDGE_H
-/* FDB notification bits for NDA_NOTIFY:
- * - BR_FDB_NFY_STATIC - notify on activity/expire even for a static entry
- * - BR_FDB_NFY_INACTIVE - mark as inactive to avoid double notification,
- *                         used with BR_FDB_NFY_STATIC (kernel controlled)
- */
-enum {
-	BR_FDB_NFY_STATIC,
-	BR_FDB_NFY_INACTIVE,
-	BR_FDB_NFY_MAX
-};
+#define BR_SPH_LIST_SIZE 10
 #endif
 
 static vlanid_t filter_vlan = 0;
@@ -2490,13 +2481,6 @@ static int netlink_nexthop_process_group(struct rtattr **tb,
 		return count;
 	}
 
-#if 0
-	// TODO: Need type for something?
-	zlog_debug("Nexthop group type: %d",
-		   *((uint16_t *)RTA_DATA(tb[NHA_GROUP_TYPE])));
-
-#endif
-
 	for (int i = 0; ((i < count) && (i < z_grp_size)); i++) {
 		z_grp[i].id = n_grp[i].id;
 		z_grp[i].weight = n_grp[i].weight + 1;
@@ -2766,11 +2750,23 @@ static ssize_t netlink_neigh_update_msg_encode(
 	}
 
 	if (nfy) {
-		if (!nl_attr_put(&req->n, datalen, NDA_NOTIFY,
-				&nfy_flags, sizeof(nfy_flags)))
+		struct rtattr *nest;
+
+		nest = nl_attr_nest(&req->n, datalen,
+				    NDA_FDB_EXT_ATTRS | NLA_F_NESTED);
+		if (!nest)
+			return 0;
+
+		if (!nl_attr_put(&req->n, datalen, NFEA_ACTIVITY_NOTIFY,
+				 &nfy_flags, sizeof(nfy_flags)))
+			return 0;
+		if (!nl_attr_put(&req->n, datalen, NFEA_DONT_REFRESH, NULL, 0))
 			return 0;
+
+		nl_attr_nest_end(&req->n, nest);
 	}
 
+
 	if (ext) {
 		if (!nl_attr_put(&req->n, datalen, NDA_EXT_FLAGS, &ext_flags,
 				 sizeof(ext_flags)))
@@ -2855,7 +2851,8 @@ static int netlink_macfdb_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 	 * validation of the fields.
 	 */
 	memset(tb, 0, sizeof tb);
-	netlink_parse_rtattr(tb, NDA_MAX, NDA_RTA(ndm), len);
+	netlink_parse_rtattr_flags(tb, NDA_MAX, NDA_RTA(ndm), len,
+				   NLA_F_NESTED);
 
 	if (!tb[NDA_LLADDR]) {
 		if (IS_ZEBRA_DEBUG_KERNEL)
@@ -2897,14 +2894,21 @@ static int netlink_macfdb_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 	if (ndm->ndm_state & NUD_STALE)
 		local_inactive = true;
 
-	if (tb[NDA_NOTIFY]) {
-		uint8_t nfy_flags;
+	if (tb[NDA_FDB_EXT_ATTRS]) {
+		struct rtattr *attr = tb[NDA_FDB_EXT_ATTRS];
+		struct rtattr *nfea_tb[NFEA_MAX + 1] = {0};
+
+		netlink_parse_rtattr_nested(nfea_tb, NFEA_MAX, attr);
+		if (nfea_tb[NFEA_ACTIVITY_NOTIFY]) {
+			uint8_t nfy_flags;
 
-		dp_static = true;
-		nfy_flags = *(uint8_t *)RTA_DATA(tb[NDA_NOTIFY]);
-		/* local activity has not been detected on the entry */
-		if (nfy_flags & (1 << BR_FDB_NFY_INACTIVE))
-			local_inactive = true;
+			nfy_flags = *(uint8_t *)RTA_DATA(
+				nfea_tb[NFEA_ACTIVITY_NOTIFY]);
+			if (nfy_flags & FDB_NOTIFY_BIT)
+				dp_static = true;
+			if (nfy_flags & FDB_NOTIFY_INACTIVE_BIT)
+				local_inactive = true;
+		}
 	}
 
 	if (IS_ZEBRA_DEBUG_KERNEL)
@@ -3206,12 +3210,12 @@ ssize_t netlink_macfdb_update_ctx(struct zebra_dplane_ctx *ctx, void *data,
 	} else {
 		/* local mac */
 		if (update_flags & DPLANE_MAC_SET_STATIC) {
-			nfy_flags |= (1 << BR_FDB_NFY_STATIC);
+			nfy_flags |= FDB_NOTIFY_BIT;
 			state |= NUD_NOARP;
 		}
 
 		if (update_flags & DPLANE_MAC_SET_INACTIVE)
-			nfy_flags |= (1 << BR_FDB_NFY_INACTIVE);
+			nfy_flags |= FDB_NOTIFY_INACTIVE_BIT;
 
 		nfy = true;
 	}
@@ -3339,7 +3343,7 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 		netlink_handle_5549(ndm, zif, ifp, &ip, false);
 		if (IS_ZEBRA_DEBUG_KERNEL)
 			zlog_debug(
-				"\tNeighbor Entry Received is a 5549 entry, finished");
+				"    Neighbor Entry Received is a 5549 entry, finished");
 		return 0;
 	}
 
@@ -3368,7 +3372,7 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 	else {
 		if (IS_ZEBRA_DEBUG_KERNEL)
 			zlog_debug(
-				"\tNeighbor Entry received is not on a VLAN or a BRIDGE, ignoring");
+				"    Neighbor Entry received is not on a VLAN or a BRIDGE, ignoring");
 		return 0;
 	}