helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

iscsitarget: Fix kernel with new 4.12+ kernel

Browse Source 
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>
This commit is contained in:
Khem Raj 2017-08-28 23:32:19 -07:00 committed by Joe MacDonald
parent cc19bced6a
commit 7da4103d4a
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch Normal file
View File

@ -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);
}
}

4
meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
View File

@ -14,7 +14,9 @@ SRC_URI = "http://ftp.heanet.ie/mirrors/ubuntu/pool/universe/i/${BPN}/${BPN}_${P
file://access-sk_v6_daddr-iff-IPV6-defined.patch \
file://build_with_updated_bio_struct_of_linux_v4.3_and_above.patch \
file://build_with_updated_interfaces_of_linux_v4.8_and_above.patch \
file://fix-call-trace-of-ahash-API-calling.patch"
file://fix-call-trace-of-ahash-API-calling.patch \
file://0001-kernel-event-netlink_ack-now-requires-4-arguments.patch \
"
SRC_URI[md5sum] = "ef9bc823bbabd3c772208c00d5f2d089"
SRC_URI[sha256sum] = "d3196ccb78a43266dce28587bfe30d8ab4db7566d7bce96057dfbb84100babb5"