Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Apr 2014 15:55:38 +0000 (UTC)
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r264124 - head/sys/netipsec
Message-ID:  <201404041555.s34FtcXb064725@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ae
Date: Fri Apr  4 15:55:38 2014
New Revision: 264124
URL: http://svnweb.freebsd.org/changeset/base/264124

Log:
  Remove dead code.
  
  MFC after:	1 week
  Sponsored by:	Yandex LLC

Modified:
  head/sys/netipsec/xform_ipip.c

Modified: head/sys/netipsec/xform_ipip.c
==============================================================================
--- head/sys/netipsec/xform_ipip.c	Fri Apr  4 15:52:45 2014	(r264123)
+++ head/sys/netipsec/xform_ipip.c	Fri Apr  4 15:55:38 2014	(r264124)
@@ -65,9 +65,6 @@
 #include <netinet/ip_ecn.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_encap.h>
-#ifdef MROUTING
-#include <netinet/ip_mroute.h>
-#endif
 
 #include <netipsec/ipsec.h>
 #include <netipsec/xform.h>
@@ -208,18 +205,8 @@ _ipip_input(struct mbuf *m, int iphlen, 
 			return;
 		}
 	}
-
 	ipo = mtod(m, struct ip *);
 
-#ifdef MROUTING
-	if (ipo->ip_v == IPVERSION && ipo->ip_p == IPPROTO_IPV4) {
-		if (IN_MULTICAST(((struct ip *)((char *) ipo + iphlen))->ip_dst.s_addr)) {
-			ipip_mroute_input (m, iphlen);
-			return;
-		}
-	}
-#endif /* MROUTING */
-
 	/* Keep outer ecn field. */
 	switch (v >> 4) {
 #ifdef INET



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404041555.s34FtcXb064725>