[Pkg-iscsi-maintainers] [SCM] Debian iscsitarget packaging branch, master, updated. debian/1.4.20.2-1-3-g5fa61ab

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit d782dbfc8ceb1d853dc9d91344920abf5a242240
Author: Michael Prokop <mika at grml.org>
Date:   Tue Nov 23 11:31:36 2010 +0100

    Fix compile against kernel 2.6.36

diff --git a/debian/changelog b/debian/changelog
index 9eaecd5..5c5af60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+iscsitarget (1.4.20.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * NIPQUAD definition has been removed in kernel 2.6.36,
+    adjust kernel/conn.c accordingly so iscsitarget compiles
+    against kernel 2.6.36.
+
+ -- Michael Prokop <mika at grml.org>  Tue, 23 Nov 2010 11:29:48 +0100
+
 iscsitarget (1.4.20.2-1) unstable; urgency=low
 
   * New Upstream Bug Fix Release
diff --git a/kernel/conn.c b/kernel/conn.c
index ec6dada..c7b8ea1 100644
--- a/kernel/conn.c
+++ b/kernel/conn.c
@@ -44,7 +44,7 @@ void conn_info_show(struct seq_file *seq, struct iscsi_session *session)
 		switch (sk->sk_family) {
 		case AF_INET:
 			snprintf(buf, sizeof(buf),
-				 "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->inet_daddr));
+				 "%pI4", inet_sk(sk)->inet_daddr);
 			break;
 		case AF_INET6:
 			snprintf(buf, sizeof(buf), "[%pI6]",

-- 
Debian iscsitarget packaging