From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 30 Jan 2024 18:32:06 +0000 (-0800)
Subject: 6.1-stable patches
X-Git-Tag: v6.1.76~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f818095d44651b152691dd3778aa5060974d467;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	net-mlx5e-handle-hardware-ipsec-limits-events.patch
---

diff --git a/queue-6.1/net-mlx5e-handle-hardware-ipsec-limits-events.patch b/queue-6.1/net-mlx5e-handle-hardware-ipsec-limits-events.patch
new file mode 100644
index 00000000000..7ce8fad8e78
--- /dev/null
+++ b/queue-6.1/net-mlx5e-handle-hardware-ipsec-limits-events.patch
@@ -0,0 +1,41 @@
+From 8c582ddfbb473c1d799c40b5140aed81278e2837 Mon Sep 17 00:00:00 2001
+From: Leon Romanovsky <leonro@nvidia.com>
+Date: Fri, 2 Dec 2022 22:14:55 +0200
+Subject: net/mlx5e: Handle hardware IPsec limits events
+
+From: Leon Romanovsky <leonro@nvidia.com>
+
+commit 8c582ddfbb473c1d799c40b5140aed81278e2837 upstream.
+
+Enable object changed event to signal IPsec about hitting
+soft and hard limits.
+
+Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
+Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
+Cc: Florian Fainelli <f.fainelli@gmail.com>
+Cc: Naresh Kamboju <naresh.kamboju@linaro.org>
+[ only take the #ifdef movement portion of the commit to resolve some 6.1.y
+  build errors - gregkh ]
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
+@@ -34,7 +34,6 @@
+ #ifndef __MLX5E_IPSEC_H__
+ #define __MLX5E_IPSEC_H__
+ 
+-#ifdef CONFIG_MLX5_EN_IPSEC
+ 
+ #include <linux/mlx5/device.h>
+ #include <net/xfrm.h>
+@@ -146,6 +145,7 @@ struct mlx5e_ipsec_sa_entry {
+ 	struct mlx5e_ipsec_modify_state_work modify_work;
+ };
+ 
++#ifdef CONFIG_MLX5_EN_IPSEC
+ int mlx5e_ipsec_init(struct mlx5e_priv *priv);
+ void mlx5e_ipsec_cleanup(struct mlx5e_priv *priv);
+ void mlx5e_ipsec_build_netdev(struct mlx5e_priv *priv);
diff --git a/queue-6.1/series b/queue-6.1/series
index 7b1d0726c59..08e47918b4a 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -183,3 +183,4 @@ mips-call-lose_fpu-0-before-initializing-fcr31-in-mips_set_personality_nan.patch
 tick-sched-preserve-number-of-idle-sleeps-across-cpu-hotplug-events.patch
 x86-entry-ia32-ensure-s32-is-sign-extended-to-s64.patch
 serial-core-fix-kernel-doc-for-uart_port_unlock_irqrestore.patch
+net-mlx5e-handle-hardware-ipsec-limits-events.patch