diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-08-28 23:32:19 -0700 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2017-09-12 10:55:06 -0400 |
commit | 7da4103d4a6ac2af8285e2c9d66ac138bfb071f9 (patch) | |
tree | 4e37ce129da4276252a988a1d0396751ba8bebfa /meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch | |
parent | cc19bced6af85818bb2dbcd4d30e335b874b43cf (diff) | |
download | meta-openembedded-contrib-7da4103d4a6ac2af8285e2c9d66ac138bfb071f9.tar.gz |
iscsitarget: Fix kernel with new 4.12+ kernel
Fix patch to be able to work kernel < 4.12.0
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch')
-rw-r--r-- | meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch b/meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch new file mode 100644 index 0000000000..4426d3552d --- /dev/null +++ b/meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch @@ -0,0 +1,40 @@ +From cbc5f8151017f45231b75a826f18354a81c287c4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 26 Aug 2017 07:52:59 -0700 +Subject: [PATCH] kernel/event: netlink_ack() now requires 4 arguments + +see https://patchwork.kernel.org/patch/9670181/ + +event.c:32:4: error: too few arguments to function 'netlink_ack' +| netlink_ack(skb, nlh, 0); +| ^~~~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + kernel/event.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: iscsitarget-1.4.20.3+svn502/kernel/event.c +=================================================================== +--- iscsitarget-1.4.20.3+svn502.orig/kernel/event.c ++++ iscsitarget-1.4.20.3+svn502/kernel/event.c +@@ -6,6 +6,7 @@ + * Some functions are based on audit code. + */ + ++#include <linux/version.h> + #include <linux/module.h> + #include <net/tcp.h> + #include "iet_u.h" +@@ -29,7 +30,11 @@ static void event_recv_skb(struct sk_buf + ietd_pid = NETLINK_CB(skb).portid; + WARN_ON(ietd_pid == 0); + if (nlh->nlmsg_flags & NLM_F_ACK) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ netlink_ack(skb, nlh, 0, NULL); ++#else + netlink_ack(skb, nlh, 0); ++#endif + skb_pull(skb, rlen); + } + } |