From 94b520bbb176b0aab3ff65c7d0b30657debb14f3 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sun, 12 Nov 2023 01:48:42 +0800
Subject: [PATCH] [FRR][patch] Add encap type when building packet for FPM
 (#17052) (#17145)

---
 ...ap-type-when-building-packet-for-FPM.patch | 50 +++++++++++++++++++
 src/sonic-frr/patch/series                    |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 src/sonic-frr/patch/0026-zebra-Add-encap-type-when-building-packet-for-FPM.patch

diff --git a/src/sonic-frr/patch/0026-zebra-Add-encap-type-when-building-packet-for-FPM.patch b/src/sonic-frr/patch/0026-zebra-Add-encap-type-when-building-packet-for-FPM.patch
new file mode 100644
index 0000000000..8d7cdc34f4
--- /dev/null
+++ b/src/sonic-frr/patch/0026-zebra-Add-encap-type-when-building-packet-for-FPM.patch
@@ -0,0 +1,50 @@
+From b914b0ad506649b5d341b549a37d3cb73e72b494 Mon Sep 17 00:00:00 2001
+From: Stepan Blyschak <stepanb@nvidia.com>
+Date: Mon, 30 Oct 2023 14:31:45 +0200
+Subject: [PATCH] zebra: Add encap type when building packet for FPM
+
+Signed-off-by: Donald Sharp <sharpd@nvidia.com>
+Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
+---
+ zebra/rt_netlink.c | 22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
+index 6b9b04785..71505e037 100644
+--- a/zebra/rt_netlink.c
++++ b/zebra/rt_netlink.c
+@@ -2269,19 +2269,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) {
+-- 
+2.17.1
+
diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series
index dd689f4882..d914370a70 100644
--- a/src/sonic-frr/patch/series
+++ b/src/sonic-frr/patch/series
@@ -25,3 +25,4 @@ cross-compile-changes.patch
 0023-bgpd-Make-sure-we-have-enough-data-to-read-two-bytes.patch
 0024-bgpd-Do-not-process-NLRIs-if-the-attribute-length-is.patch
 0025-bgpd-Use-treat-as-withdraw-for-tunnel-encapsulation-.patch
+0026-zebra-Add-encap-type-when-building-packet-for-FPM.patch