From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 9 Jun 2023 15:16:17 +0000 (+0200)
Subject: 4.19-stable patches
X-Git-Tag: v4.14.318~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a6c9f2354a43df8e9b5e904e499a9a590537407;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	i40e-fix-build-warnings-in-i40e_alloc.h.patch
---

diff --git a/queue-4.19/i40e-fix-build-warnings-in-i40e_alloc.h.patch b/queue-4.19/i40e-fix-build-warnings-in-i40e_alloc.h.patch
new file mode 100644
index 00000000000..1a3356aeae6
--- /dev/null
+++ b/queue-4.19/i40e-fix-build-warnings-in-i40e_alloc.h.patch
@@ -0,0 +1,43 @@
+From foo@baz Fri Jun  9 05:10:11 PM CEST 2023
+Date: Fri, 09 Jun 2023 17:10:11 +0200
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: i40e: fix build warnings in i40e_alloc.h
+
+Not upstream as it was fixed in a much larger api change in newer
+kernels.
+
+gcc-13 rightfully complains that enum is not the same as an int, so fix
+up the function prototypes in i40e_alloc.h to be correct, solving a
+bunch of build warnings.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/intel/i40e/i40e_alloc.h |   17 ++++++-----------
+ 1 file changed, 6 insertions(+), 11 deletions(-)
+
+--- a/drivers/net/ethernet/intel/i40e/i40e_alloc.h
++++ b/drivers/net/ethernet/intel/i40e/i40e_alloc.h
+@@ -20,16 +20,11 @@ enum i40e_memory_type {
+ };
+ 
+ /* prototype for functions used for dynamic memory allocation */
+-i40e_status i40e_allocate_dma_mem(struct i40e_hw *hw,
+-					    struct i40e_dma_mem *mem,
+-					    enum i40e_memory_type type,
+-					    u64 size, u32 alignment);
+-i40e_status i40e_free_dma_mem(struct i40e_hw *hw,
+-					struct i40e_dma_mem *mem);
+-i40e_status i40e_allocate_virt_mem(struct i40e_hw *hw,
+-					     struct i40e_virt_mem *mem,
+-					     u32 size);
+-i40e_status i40e_free_virt_mem(struct i40e_hw *hw,
+-					 struct i40e_virt_mem *mem);
++int i40e_allocate_dma_mem(struct i40e_hw *hw, struct i40e_dma_mem *mem,
++			  enum i40e_memory_type type, u64 size, u32 alignment);
++int i40e_free_dma_mem(struct i40e_hw *hw, struct i40e_dma_mem *mem);
++int i40e_allocate_virt_mem(struct i40e_hw *hw, struct i40e_virt_mem *mem,
++			   u32 size);
++int i40e_free_virt_mem(struct i40e_hw *hw, struct i40e_virt_mem *mem);
+ 
+ #endif /* _I40E_ALLOC_H_ */
diff --git a/queue-4.19/series b/queue-4.19/series
index 056bcb7eb6f..73e29108aea 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -1 +1,2 @@
 i40iw-fix-build-warning-in-i40iw_manage_apbvt.patch
+i40e-fix-build-warnings-in-i40e_alloc.h.patch