Merge pull request #14754 from FRRouting/mergify/bp/stable/8.5/pr-14675

zebra: Add encap type when building packet for FPM (backport #14675)
FRRouting · Nov 8, 2023 · 31b4c7a · 31b4c7a
2 parents 24f2b7d + f0f7b28
commit 31b4c7a
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
@@ -2235,19 +2235,21 @@ ssize_t netlink_route_multipath_msg_encode(int cmd,
 					    p, routedesc, bytelen, nexthop,
 					    &req->n, &req->r, datalen, cmd))
 					return 0;
+
+				/*
+				 * Add encapsulation information when
+				 * installing via FPM.
+				 */
+				if (fpm) {
+					if (!netlink_route_nexthop_encap(&req->n,
+									 datalen,
+									 nexthop))
+						return 0;
+				}
+
 				nexthop_num++;
 				break;
 			}
-
-			/*
-			 * Add encapsulation information when installing via
-			 * FPM.
-			 */
-			if (fpm) {
-				if (!netlink_route_nexthop_encap(
-					    &req->n, datalen, nexthop))
-					return 0;
-			}
 		}
 
 		if (setsrc) {