Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.169.2.8
retrieving revision 1.224
diff -u -p -r1.169.2.8 -r1.224
--- src/sys/netinet/ip_input.c	2005/11/10 14:11:07	1.169.2.8
+++ src/sys/netinet/ip_input.c	2006/02/18 17:47:07	1.224
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.169.2.8 2005/11/10 14:11:07 skrll Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.224 2006/02/18 17:47:07 joerg Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.169.2.8 2005/11/10 14:11:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.224 2006/02/18 17:47:07 joerg Exp $");
 
 #include "opt_inet.h"
 #include "opt_gateway.h"
@@ -279,10 +279,10 @@ static u_int	ip_reass_ttl_decr(u_int tic
 static void	ip_reass_drophalf(void);
 
 
-static __inline int ipq_lock_try(void);
-static __inline void ipq_unlock(void);
+static inline int ipq_lock_try(void);
+static inline void ipq_unlock(void);
 
-static __inline int
+static inline int
 ipq_lock_try(void)
 {
 	int s;
@@ -301,7 +301,7 @@ ipq_lock_try(void)
 	return (1);
 }
 
-static __inline void
+static inline void
 ipq_unlock(void)
 {
 	int s;
@@ -1839,10 +1839,10 @@ ip_forward(struct mbuf *m, int srcrt)
 
 	dest = 0;
 #ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf("forward: src %2.2x dst %2.2x ttl %x\n",
-		    ntohl(ip->ip_src.s_addr),
-		    ntohl(ip->ip_dst.s_addr), ip->ip_ttl);
+	if (ipprintfs) {
+		printf("forward: src %s ", inet_ntoa(ip->ip_src));
+		printf("dst %s ttl %x\n", inet_ntoa(ip->ip_dst), ip->ip_ttl);
+	}
 #endif
 	if (m->m_flags & (M_BCAST|M_MCAST) || in_canforward(ip->ip_dst) == 0) {
 		ipstat.ips_cantforward++;