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.233
retrieving revision 1.235
diff -u -p -r1.233 -r1.235
--- src/sys/netinet/ip_input.c	2006/10/05 17:35:19	1.233
+++ src/sys/netinet/ip_input.c	2006/10/12 01:32:38	1.235
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.233 2006/10/05 17:35:19 tls Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.235 2006/10/12 01:32:38 christos 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.233 2006/10/05 17:35:19 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.235 2006/10/12 01:32:38 christos Exp $");
 
 #include "opt_inet.h"
 #include "opt_gateway.h"
@@ -377,8 +377,8 @@ static	struct ip_srcrt {
 static void save_rte(u_char *, struct in_addr);
 
 #ifdef MBUFTRACE
-struct mowner ip_rx_mowner = { "internet", "rx" };
-struct mowner ip_tx_mowner = { "internet", "tx" };
+struct mowner ip_rx_mowner = MOWNER_INIT("internet", "rx");
+struct mowner ip_tx_mowner = MOWNER_INIT("internet", "tx");
 #endif
 
 /*
@@ -1794,7 +1794,7 @@ ip_srcroute(void)
  * XXX should be deleted; last arg currently ignored.
  */
 void
-ip_stripoptions(struct mbuf *m, struct mbuf *mopt)
+ip_stripoptions(struct mbuf *m, struct mbuf *mopt __unused)
 {
 	int i;
 	struct ip *ip = mtod(m, struct ip *);