summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2005-08-30 07:51:28 +0200
committerDavid S. Miller <davem@davemloft.net>2005-08-30 07:51:28 +0200
commitd8971fcb702e24d1e22c77fd1772f182ffee87e3 (patch)
treec5bb70df39b4816ceb86b77672c49115702f1e20
parentMerge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/... (diff)
downloadlinux-d8971fcb702e24d1e22c77fd1772f182ffee87e3.tar.xz
linux-d8971fcb702e24d1e22c77fd1772f182ffee87e3.zip
[INET]: compile errors when DEBUG is defined
Fix build problem found by compiling driver with DEBUG defined that used tcp.h. Since pr_debug(arg) expands to printk("<7>" arg) the argument needs to be string that can be concatenated. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/inet_connection_sock.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 8a87a3a4f107..651f824c1008 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -147,7 +147,7 @@ static inline void inet_csk_clear_xmit_timer(struct sock *sk, const int what)
}
#ifdef INET_CSK_DEBUG
else {
- pr_debug(inet_csk_timer_bug_msg);
+ pr_debug("%s", inet_csk_timer_bug_msg);
}
#endif
}
@@ -180,7 +180,7 @@ static inline void inet_csk_reset_xmit_timer(struct sock *sk, const int what,
}
#ifdef INET_CSK_DEBUG
else {
- pr_debug(inet_csk_timer_bug_msg);
+ pr_debug("%s", inet_csk_timer_bug_msg);
}
#endif
}