[Iscsitarget-devel] [PATCH] Fix compilation against linux 3.7

[Dhionel D. <dd...@ce...>]

Tested in server running Debian wheezy and linux 3.7 from experimental branch

Signed-off-by: Dhionel Díaz <dd...@ce...>
---
 Makefile                 |    4 ++++
 kernel/event.c           |    3 +--
 patches/compat-3.6.patch |   21 +++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 patches/compat-3.6.patch

diff --git a/Makefile b/Makefile
index df41642..e565189 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,6,0),1)
+	PATCHES := $(PATCHES) compat-3.6.patch
+endif
+
 ifeq ($(call kver_le,3,5,0),1)
 	PATCHES := $(PATCHES) compat-3.5.patch
 endif
diff --git a/kernel/event.c b/kernel/event.c
index 1c5f3a4..682772a 100644
--- a/kernel/event.c
+++ b/kernel/event.c
@@ -26,7 +26,7 @@ static void event_recv_skb(struct sk_buff *skb)
 		rlen = NLMSG_ALIGN(nlh->nlmsg_len);
 		if (rlen > skb->len)
 			rlen = skb->len;
-		ietd_pid = NETLINK_CB(skb).pid;
+		ietd_pid = NETLINK_CB(skb).portid;
 		WARN_ON(ietd_pid == 0);
 		if (nlh->nlmsg_flags & NLM_F_ACK)
 			netlink_ack(skb, nlh, 0);
@@ -77,7 +77,6 @@ int event_init(void)
 
 	nl = netlink_kernel_create(&init_net,
 				   NETLINK_IET,
-				   THIS_MODULE,
 				   &cfg);
 	if (!nl)
 		return -ENOMEM;
diff --git a/patches/compat-3.6.patch b/patches/compat-3.6.patch
new file mode 100644
index 0000000..74e60ff
--- /dev/null
+++ b/patches/compat-3.6.patch
@@ -0,0 +1,21 @@
+diff --git b/kernel/event.c a/kernel/event.c
+index 682772a..1c5f3a4 100644
+--- b/kernel/event.c
++++ a/kernel/event.c
+@@ -26,7 +26,7 @@ static void event_recv_skb(struct sk_buff *skb)
+ 		rlen = NLMSG_ALIGN(nlh->nlmsg_len);
+ 		if (rlen > skb->len)
+ 			rlen = skb->len;
+-		ietd_pid = NETLINK_CB(skb).portid;
++		ietd_pid = NETLINK_CB(skb).pid;
+ 		WARN_ON(ietd_pid == 0);
+ 		if (nlh->nlmsg_flags & NLM_F_ACK)
+ 			netlink_ack(skb, nlh, 0);
+@@ -77,6 +77,7 @@ int event_init(void)
+ 
+ 	nl = netlink_kernel_create(&init_net,
+ 				   NETLINK_IET,
++				   THIS_MODULE,
+ 				   &cfg);
+ 	if (!nl)
+ 		return -ENOMEM;
-- 
1.7.10.4