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.307.2.3
retrieving revision 1.311
diff -u -p -r1.307.2.3 -r1.311
--- src/sys/netinet/ip_input.c	2014/05/18 17:46:13	1.307.2.3
+++ src/sys/netinet/ip_input.c	2014/05/22 22:01:12	1.311
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.307.2.3 2014/05/18 17:46:13 rmind Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.311 2014/05/22 22:01:12 rmind Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.307.2.3 2014/05/18 17:46:13 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.311 2014/05/22 22:01:12 rmind Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -1314,10 +1314,11 @@ ip_forward(struct mbuf *m, int srcrt)
 }
 
 void
-ip_savecontrol(inpcb_t *inp, struct mbuf **mp, struct ip *ip, struct mbuf *m)
+ip_savecontrol(struct inpcb *inp, struct mbuf **mp, struct ip *ip,
+    struct mbuf *m)
 {
-	struct socket *so = inpcb_get_socket(inp);
-	int inpflags = inpcb_get_flags(inp);
+	struct socket *so = inp->inp_socket;
+	int inpflags = inp->inp_flags;
 
 	if (so->so_options & SO_TIMESTAMP
 #ifdef SO_OTIMESTAMP