File iscsitarget-kernel-3.6.0.patch of Package iscsitarget

Overview Repositories Revisions Requests Users Attributes Meta

File iscsitarget-kernel-3.6.0.patch of Package iscsitarget

From: 	Arne Redlich <arne.redlich@googlemail.com>

Signed-off-by: Arne Redlich <arne.redlich@googlemail.com>
Signed-off-by: Lee Duncan <lduncan@suse.com>
---
 Makefile                 |    4 ++++
 kernel/event.c           |   13 +++++++++++--
 patches/compat-3.5.patch |   24 ++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 patches/compat-3.5.patch

diff --git a/Makefile b/Makefile
index a3dd653..df41642 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,10 @@ kver_lk = $(shell [ `echo $(KVER) | egrep $(1)` ] && echo 1 || echo 0)
 # base first the earlier patch sets will not need to be modified.
 #
 
+ifeq ($(call kver_le,3,5,0),1)
+	PATCHES := $(PATCHES) compat-3.5.patch
+endif
+
 ifeq ($(call kver_le,3,4,0),1)
 	PATCHES := $(PATCHES) compat-3.2-3.4.patch
 endif
diff --git a/kernel/event.c b/kernel/event.c
index 0266101..1c5f3a4 100644
--- a/kernel/event.c
+++ b/kernel/event.c
@@ -68,8 +68,17 @@ int event_send(u32 tid, u64 sid, u32 cid, u32 state, int atomic)
 
 int event_init(void)
 {
-	nl = netlink_kernel_create(&init_net, NETLINK_IET, 1, event_recv_skb,
-				   NULL, THIS_MODULE);
+	struct netlink_kernel_cfg cfg = {
+		.groups = 1,
+		.input = event_recv_skb,
+		.cb_mutex = NULL,
+		.bind = NULL,
+	};
+
+	nl = netlink_kernel_create(&init_net,
+				   NETLINK_IET,
+				   THIS_MODULE,
+				   &cfg);
 	if (!nl)
 		return -ENOMEM;
 	else
diff --git a/patches/compat-3.5.patch b/patches/compat-3.5.patch
new file mode 100644
index 0000000..638131e
--- /dev/null
+++ b/patches/compat-3.5.patch
@@ -0,0 +1,24 @@
+diff --git b/kernel/event.c a/kernel/event.c
+index 1c5f3a4..0266101 100644
+--- b/kernel/event.c
++++ a/kernel/event.c
+@@ -68,17 +68,8 @@ int event_send(u32 tid, u64 sid, u32 cid, u32 state, int atomic)
+ 
+ int event_init(void)
+ {
+-	struct netlink_kernel_cfg cfg = {
+-		.groups = 1,
+-		.input = event_recv_skb,
+-		.cb_mutex = NULL,
+-		.bind = NULL,
+-	};
+-
+-	nl = netlink_kernel_create(&init_net,
+-				   NETLINK_IET,
+-				   THIS_MODULE,
+-				   &cfg);
++	nl = netlink_kernel_create(&init_net, NETLINK_IET, 1, event_recv_skb,
++				   NULL, THIS_MODULE);
+ 	if (!nl)
+ 		return -ENOMEM;
+ 	else
-- 
1.7.9.5

Places

File iscsitarget-kernel-3.6.0.patch of Package iscsitarget

Places