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/raw_ip.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/raw_ip.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.112.2.1
retrieving revision 1.114.2.2
diff -u -p -r1.112.2.1 -r1.114.2.2
--- src/sys/netinet/raw_ip.c	2012/04/17 00:08:41	1.112.2.1
+++ src/sys/netinet/raw_ip.c	2013/06/23 06:20:25	1.114.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip.c,v 1.112.2.1 2012/04/17 00:08:41 yamt Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.114.2.2 2013/06/23 06:20:25 tls Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.112.2.1 2012/04/17 00:08:41 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.114.2.2 2013/06/23 06:20:25 tls Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -94,11 +94,11 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1
 #include <netinet/in_proto.h>
 #include <netinet/in_var.h>
 
-#ifdef FAST_IPSEC
+#ifdef IPSEC
 #include <netipsec/ipsec.h>
 #include <netipsec/ipsec_var.h>
 #include <netipsec/ipsec_private.h>
-#endif	/* FAST_IPSEC */
+#endif	/* IPSEC */
 
 #ifdef COMPAT_50
 #include <compat/sys/socket.h>
@@ -203,7 +203,7 @@ rip_input(struct mbuf *m, ...)
 			continue;
 		if (last == NULL)
 			;
-#if defined(FAST_IPSEC)
+#if defined(IPSEC)
 		/* check AH/ESP integrity. */
 		else if (ipsec4_in_reject_so(m, last->inp_socket)) {
 			IPSEC_STATINC(IPSEC_STAT_IN_POLVIO);
@@ -217,7 +217,7 @@ rip_input(struct mbuf *m, ...)
 		}
 		last = inp;
 	}
-#if defined(FAST_IPSEC)
+#if defined(IPSEC)
 	/* check AH/ESP integrity. */
 	if (last != NULL && ipsec4_in_reject_so(m, last->inp_socket)) {
 		m_freem(m);
@@ -478,8 +478,7 @@ rip_bind(struct inpcb *inp, struct mbuf 
 		return (EINVAL);
 	if (TAILQ_FIRST(&ifnet) == 0)
 		return (EADDRNOTAVAIL);
-	if (addr->sin_family != AF_INET &&
-	    addr->sin_family != AF_IMPLINK)
+	if (addr->sin_family != AF_INET)
 		return (EAFNOSUPPORT);
 	if (!in_nullhost(addr->sin_addr) &&
 	    ifa_ifwithaddr(sintosa(addr)) == 0)
@@ -497,8 +496,7 @@ rip_connect(struct inpcb *inp, struct mb
 		return (EINVAL);
 	if (TAILQ_FIRST(&ifnet) == 0)
 		return (EADDRNOTAVAIL);
-	if (addr->sin_family != AF_INET &&
-	    addr->sin_family != AF_IMPLINK)
+	if (addr->sin_family != AF_INET)
 		return (EAFNOSUPPORT);
 	inp->inp_faddr = addr->sin_addr;
 	return (0);