Merge pull request #29 from ritika0313/T8141

T8141: Update patches compatible with VPP 25.10

Author: sever-sever

patches/vpp/0001-linux-cp-add-support-for-xfrm-netlink-notifcation.patch

@@ -1,4 +1,4 @@
-From a3240c47714ae9ed447581c3557983630bb5f825 Mon Sep 17 00:00:00 2001
+From 2b676ce740068202aab2002f3efa0652c8b1c265 Mon Sep 17 00:00:00 2001
 From: Aakash <saakashkumar@marvell.com>
 Date: Mon, 1 Aug 2022 04:59:02 -0400
 Subject: [PATCH] linux-cp: add support for xfrm netlink notifcation
@@ -2473,5 +2473,5 @@ index 000000000..21497cde9
 + * End:
 + */
 -- 
-2.39.5
+2.51.2
 

patches/vpp/0002-linux-cp-update-code-to-support-api-proto-changes.patch

@@ -1,4 +1,4 @@
-From e238d4e62e66ed9a9e01425a844d57cc33ec316e Mon Sep 17 00:00:00 2001
+From c730ee0f262e58d95a3ad0d4181446c2a305a5fb Mon Sep 17 00:00:00 2001
 From: Kommula Shiva Shankar <kshankar@marvell.com>
 Date: Tue, 6 Feb 2024 23:23:14 +0530
 Subject: [PATCH] linux-cp: update code to support api proto changes
@@ -28,5 +28,5 @@ index 5b3a46058..3e5904454 100644
      {
        NL_XFRM_ERR ("ipsec sa add %x failure(err: %d) %U -> %U", id, rv,
 -- 
-2.39.5
+2.51.2
 

patches/vpp/0003-linux-cp-add-ipsec-interface-support-for-xfrm.patch

@@ -1,4 +1,4 @@
-From 70286cf59119cc1c122d449ee3fd678646ae1b40 Mon Sep 17 00:00:00 2001
+From b456ab8cd03ffdece1e201211a3d24d6fcafbec8 Mon Sep 17 00:00:00 2001
 From: Bheemappa Agasimundin <bagasimundin@marvell.com>
 Date: Tue, 5 Dec 2023 18:25:33 +0000
 Subject: [PATCH] linux-cp: add ipsec interface support for xfrm
@@ -306,5 +306,5 @@ index 21497cde9..4eabf40e6 100644
  }
 
 -- 
-2.39.5
+2.51.2
 

patches/vpp/0004-linux-cp-initialize-sw_if_index-variable.patch

@@ -1,4 +1,4 @@
-From 0a6768dea23e4bf4621dac89b166b869f54cc53f Mon Sep 17 00:00:00 2001
+From f4b525e43e085bb06fcb82a369c6eaee9085830b Mon Sep 17 00:00:00 2001
 From: Kommula Shiva Shankar <kshankar@marvell.com>
 Date: Wed, 7 Feb 2024 11:58:17 +0530
 Subject: [PATCH] linux-cp: initialize sw_if_index variable
@@ -28,5 +28,5 @@ index 79194c226..fe83a948a 100644
    u8 *s = NULL;
    u8 instance = xfrmnl_sa_get_reqid (sa);
 -- 
-2.39.5
+2.51.2
 

patches/vpp/0005-linux-cp-add-readme-for-xfrm-implementation.patch

@@ -1,4 +1,4 @@
-From 33348f8e70e26c3fa93ca921cafef5e9af85337c Mon Sep 17 00:00:00 2001
+From a42d50376bf27475448e28b8bf0c52f44a80d9cb Mon Sep 17 00:00:00 2001
 From: Bheemappa Agasimundin <bagasimundin@marvell.com>
 Date: Sun, 24 Mar 2024 08:36:48 +0000
 Subject: [PATCH] linux-cp: add readme for xfrm implementation
@@ -199,5 +199,5 @@ index 000000000..9e63646dd
 + nl-batch-delay-ms <>
 +}
 -- 
-2.39.5
+2.51.2
 

patches/vpp/0006-linux-cp-fix-esn-and-anti-replay-issue.patch

@@ -1,4 +1,4 @@
-From adff1ecb857315e7d3e735efe31dc9b322183732 Mon Sep 17 00:00:00 2001
+From 12d6216c13960bf83d18677988b3962717096bee Mon Sep 17 00:00:00 2001
 From: Bheemappa Agasimundin <bagasimundin@marvell.com>
 Date: Tue, 27 Aug 2024 17:29:30 +0000
 Subject: [PATCH] linux-cp: fix esn and anti-replay issue
@@ -36,5 +36,5 @@ index fe83a948a..c847e699f 100644
    /*
     * Kernel SA XFRM doesnt have a flag for AR config. So a non-zero
 -- 
-2.39.5
+2.51.2
 

patches/vpp/0007-linux-cp-fix-ipsec-policy-incorrect-protocol-type.patch

@@ -1,4 +1,4 @@
-From e5d9989fe860fd394d131c791c3e74bd8952c230 Mon Sep 17 00:00:00 2001
+From 037b12a331cfdb1bb84882c138cfa4144630b6c3 Mon Sep 17 00:00:00 2001
 From: Bheemappa Agasimundin <bagasimundin@marvell.com>
 Date: Tue, 1 Oct 2024 15:06:41 +0000
 Subject: [PATCH] linux-cp: fix ipsec policy incorrect protocol type
@@ -51,5 +51,5 @@ index c847e699f..ff6e79649 100644
 
    lcp_xfrm_mk_ipaddr (sel_dst, &sel_daddr);
 -- 
-2.39.5
+2.51.2
 

patches/vpp/0008-linux-cp-Added-build-dependency-for-XFRM.patch

@@ -1,4 +1,4 @@
-From 56275b6a0dbe20b8eb77a16b6525a34ab71b33ca Mon Sep 17 00:00:00 2001
+From d1e5a33fccb599ebcfb7fba73e53fa87ea73083c Mon Sep 17 00:00:00 2001
 From: zdc <taras@vyos.io>
 Date: Wed, 12 Feb 2025 12:29:57 +0200
 Subject: [PATCH] linux-cp: Added build dependency for XFRM
@@ -12,10 +12,10 @@ Added `libnl-xfrm-3-200` to build dependencies to make build
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile b/Makefile
-index 3cdaf2778..19dafb7c6 100644
+index 593ea4e98..9c71ae9e6 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -108,6 +108,7 @@ DEB_DEPENDS += tshark
+@@ -116,6 +116,7 @@ DEB_DEPENDS += tshark
  DEB_DEPENDS += jq # for extracting test summary from .json report (hs-test)
  DEB_DEPENDS += libiberty-dev
  DEB_DEPENDS += nasm libnuma-dev # for make-ext-deps
@@ -24,5 +24,5 @@ index 3cdaf2778..19dafb7c6 100644
  LIBFFI=libffi6 # works on all but 20.04 and debian-testing
  ifeq ($(OS_VERSION_ID),24.04)
 -- 
-2.39.5
+2.51.2
 

…010-Resync-ip-fib-with-Linux-state.patch …009-Resync-ip-fib-with-Linux-state.patchpatches/vpp/0010-Resync-ip-fib-with-Linux-state.patch renamed to patches/vpp/0009-Resync-ip-fib-with-Linux-state.patch patches/vpp/0010-Resync-ip-fib-with-Linux-state.patch renamed to patches/vpp/0009-Resync-ip-fib-with-Linux-state.patch

@@ -1,4 +1,4 @@
-From d87a33a4dd33f04dce319a1e410bc811808fb7b1 Mon Sep 17 00:00:00 2001
+From 176e9de5869e19478016cf18d0575668aac3e23c Mon Sep 17 00:00:00 2001
 From: Denys Haryachyy <garyachy@gmail.com>
 Date: Wed, 24 Jul 2024 08:35:25 +0000
 Subject: [PATCH] Resync ip fib with Linux state.
@@ -76,10 +76,10 @@ index 0db502988..ffcd4d416 100644
   * Set up the API message handling tables
   */
 diff --git a/src/plugins/linux-cp/lcp_cli.c b/src/plugins/linux-cp/lcp_cli.c
-index d10557766..000d6c20d 100644
+index e89afd2a7..92ca0d0a9 100644
 --- a/src/plugins/linux-cp/lcp_cli.c
 +++ b/src/plugins/linux-cp/lcp_cli.c
-@@ -405,6 +405,21 @@ VLIB_CLI_COMMAND (lcp_ethertype_show_command, static) = {
+@@ -393,6 +393,21 @@ VLIB_CLI_COMMAND (lcp_ethertype_show_command, static) = {
    .function = lcp_ethertype_show_cmd,
  };
 
@@ -102,10 +102,10 @@ index d10557766..000d6c20d 100644
  lcp_cli_init (vlib_main_t *vm)
  {
 diff --git a/src/plugins/linux-cp/lcp_interface.c b/src/plugins/linux-cp/lcp_interface.c
-index d831d83f9..d4547c81c 100644
+index 31864f791..cd9725c87 100644
 --- a/src/plugins/linux-cp/lcp_interface.c
 +++ b/src/plugins/linux-cp/lcp_interface.c
-@@ -1198,6 +1198,17 @@ lcp_itf_pair_replace_end (void)
+@@ -1194,6 +1194,17 @@ lcp_itf_pair_replace_end (void)
    return (0);
  }
 
@@ -140,7 +140,7 @@ index 8cf6d3f4d..6b44d3d25 100644
   * Retreive the pair in the DP
   */
 diff --git a/src/plugins/linux-cp/lcp_nl.c b/src/plugins/linux-cp/lcp_nl.c
-index 55d2ea542..5ac6ae273 100644
+index 95e1adc35..4421311ee 100644
 --- a/src/plugins/linux-cp/lcp_nl.c
 +++ b/src/plugins/linux-cp/lcp_nl.c
 @@ -43,6 +43,7 @@ typedef enum nl_status_t_
@@ -197,5 +197,5 @@ index 55d2ea542..5ac6ae273 100644
  	   * reduce the number of failed attempts that stall the main thread by
  	   * waiting out the notification storm
 -- 
-2.39.5
+2.51.2