From: Greg Kroah-Hartman Date: Fri, 9 Jun 2023 15:16:35 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v4.14.318~73 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e817282fbc88354be6931664dba6c4b592f4f014;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: i40e-fix-build-warning-in-ice_fltr_add_mac_to_list.patch i40e-fix-build-warnings-in-i40e_alloc.h.patch --- diff --git a/queue-5.10/i40e-fix-build-warning-in-ice_fltr_add_mac_to_list.patch b/queue-5.10/i40e-fix-build-warning-in-ice_fltr_add_mac_to_list.patch new file mode 100644 index 00000000000..adfb9c3d5cf --- /dev/null +++ b/queue-5.10/i40e-fix-build-warning-in-ice_fltr_add_mac_to_list.patch @@ -0,0 +1,29 @@ +From foo@baz Fri Jun 9 12:43:39 PM CEST 2023 +Date: Fri, 09 Jun 2023 12:43:39 +0200 +To: Greg KH +From: Greg Kroah-Hartman +Subject: i40e: fix build warning in ice_fltr_add_mac_to_list() + +Not upstream as this was fixed in a much larger change in commit +5e24d5984c80 ("ice: Use int for ice_status") + +The function ice_fltr_add_mac_to_list() has the wrong prototype match +from the .h file to the .c declaration, so fix it up, otherwise gcc-13 +complains (rightfully) that the type is incorrect. + +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/intel/ice/ice_fltr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/intel/ice/ice_fltr.c ++++ b/drivers/net/ethernet/intel/ice/ice_fltr.c +@@ -128,7 +128,7 @@ void ice_fltr_remove_all(struct ice_vsi + * @mac: MAC address to add + * @action: filter action + */ +-int ++enum ice_status + ice_fltr_add_mac_to_list(struct ice_vsi *vsi, struct list_head *list, + const u8 *mac, enum ice_sw_fwd_act_type action) + { diff --git a/queue-5.10/i40e-fix-build-warnings-in-i40e_alloc.h.patch b/queue-5.10/i40e-fix-build-warnings-in-i40e_alloc.h.patch new file mode 100644 index 00000000000..1a3356aeae6 --- /dev/null +++ b/queue-5.10/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 +From: Greg Kroah-Hartman +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 +--- + 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-5.10/series b/queue-5.10/series index 77ff832f007..704731fcbe1 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -7,3 +7,5 @@ f2fs-fix-iostat-lock-protection.patch blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch block-blk-iocost-gcc13-keep-large-values-in-a-new-enum.patch i40iw-fix-build-warning-in-i40iw_manage_apbvt.patch +i40e-fix-build-warnings-in-i40e_alloc.h.patch +i40e-fix-build-warning-in-ice_fltr_add_mac_to_list.patch