* Michael Prokop <m...@debian.org> [Die Nov 23, 2010 at 11:35:25 +0100]:
> Compiliation against kernel 2.6.36 fails: > /usr/src/modules/iscsitarget/kernel/conn.c: In function ‘conn_info_show’: > /usr/src/modules/iscsitarget/kernel/conn.c:47: error: implicit declaration of > function ‘NIPQUAD’ > /usr/src/modules/iscsitarget/kernel/conn.c:47: warning: too few arguments for > format The attached patch addresses this issue. regards, -mika-
From 664e3bc1edbb5569baceb56675862e06ead3e1d6 Mon Sep 17 00:00:00 2001
From: Michael Prokop <m...@grml.org>
Date: Tue, 23 Nov 2010 11:31:36 +0100
Subject: [PATCH] Fix compile against kernel 2.6.36
---
debian/changelog | 9 +++++++++
kernel/conn.c | 2 +-
2 files changed, 10 insertions(+), 1 deletions(-)
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 <m...@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]",
--
1.7.1
signature.asc
Description: Digital signature
