]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Jun 2023 15:07:09 +0000 (17:07 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Jun 2023 15:07:09 +0000 (17:07 +0200)
added patches:
i40iw-fix-build-warning-in-i40iw_manage_apbvt.patch

queue-4.14/i40iw-fix-build-warning-in-i40iw_manage_apbvt.patch [new file with mode: 0644]
queue-4.14/series

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 (file)
index 0000000..9a1fe96
--- /dev/null
@@ -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 <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+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 <gregkh@linuxfoundation.org>
+---
+ 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);
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..056bcb7eb6febf9fc7893032f350a035d05d0ce2 100644 (file)
@@ -0,0 +1 @@
+i40iw-fix-build-warning-in-i40iw_manage_apbvt.patch