From aa1489d4fa7cdeec3dafd9c0c92e153a1852a6f5 Mon Sep 17 00:00:00 2001
From: Julian Elischer <julian@FreeBSD.org>
Date: Fri, 7 Sep 2001 07:24:28 +0000
Subject: [PATCH] Remove some un-needed code that was accidentally included in
 the 2nd previous KAME patch.

Submitted by:	SUMIKAWA Munechika <sumikawa@ebina.hitachi.co.jp>
---
 sys/netinet/ip_encap.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c
index e3844dfdd8e..74534feb812 100644
--- a/sys/netinet/ip_encap.c
+++ b/sys/netinet/ip_encap.c
@@ -73,7 +73,6 @@
 #include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_var.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
@@ -205,20 +204,6 @@ encap4_input(m, off)
 		return;
 	}
 
-	/* for backward compatibility - messy... */
-	/* XXX
-	 * I THINK they meant to call ip_input()
-	 * The original code called ipip_input()
-	 * which just calls rip_input()
-	 * which makes no sense.
-	 * (It is also not compiled in in LINT)
-	 */
-	if (proto == IPPROTO_IPV4) {
-		m_adj(m, off);
-		ip_input(m/*, off */);
-		return;
-	}
-
 	/* last resort: inject to raw socket */
 	rip_input(m, off);
 }