From: Greg Kroah-Hartman Date: Fri, 9 Jun 2023 15:07:09 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v4.14.318~81 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44665c02342510caa66a726f753e3506f7d2a00d;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: i40iw-fix-build-warning-in-i40iw_manage_apbvt.patch --- diff --git a/queue-4.14/i40iw-fix-build-warning-in-i40iw_manage_apbvt.patch b/queue-4.14/i40iw-fix-build-warning-in-i40iw_manage_apbvt.patch new file mode 100644 index 00000000000..9a1fe96df19 --- /dev/null +++ b/queue-4.14/i40iw-fix-build-warning-in-i40iw_manage_apbvt.patch @@ -0,0 +1,31 @@ +From foo@baz Fri Jun 9 04:58:27 PM CEST 2023 +Date: Fri, 09 Jun 2023 16:58:27 +0200 +To: Greg KH +From: Greg Kroah-Hartman +Subject: i40iw: fix build warning in i40iw_manage_apbvt() + +Not upstream as this function is no longer around anymore. + +The function i40iw_manage_apbvt() 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/infiniband/hw/i40iw/i40iw.h | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/drivers/infiniband/hw/i40iw/i40iw.h ++++ b/drivers/infiniband/hw/i40iw/i40iw.h +@@ -414,9 +414,8 @@ void i40iw_manage_arp_cache(struct i40iw + bool ipv4, + u32 action); + +-int i40iw_manage_apbvt(struct i40iw_device *iwdev, +- u16 accel_local_port, +- bool add_port); ++enum i40iw_status_code i40iw_manage_apbvt(struct i40iw_device *iwdev, ++ u16 accel_local_port, bool add_port); + + struct i40iw_cqp_request *i40iw_get_cqp_request(struct i40iw_cqp *cqp, bool wait); + void i40iw_free_cqp_request(struct i40iw_cqp *cqp, struct i40iw_cqp_request *cqp_request); diff --git a/queue-4.14/series b/queue-4.14/series index e69de29bb2d..056bcb7eb6f 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -0,0 +1 @@ +i40iw-fix-build-warning-in-i40iw_manage_apbvt.patch