Module Name: src
Committed By: maxv
Date: Sat Apr 14 06:45:18 UTC 2018
Modified Files:
src/sys/netinet6: icmp6.c
Log Message:
Remove dead code. It is the same as the non-obsolete one, since
ICMP6_DST_UNREACH_NOTNEIGHBOR == ICMP6_DST_UNREACH_BEYONDSCOPE,
and the code leads to the same errno value (EHOSTUNREACH).
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/netinet6/icmp6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.226 src/sys/netinet6/icmp6.c:1.227
--- src/sys/netinet6/icmp6.c:1.226 Thu Apr 12 07:28:10 2018
+++ src/sys/netinet6/icmp6.c Sat Apr 14 06:45:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.226 2018/04/12 07:28:10 maxv Exp $ */
+/* $NetBSD: icmp6.c,v 1.227 2018/04/14 06:45:17 maxv Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.226 2018/04/12 07:28:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.227 2018/04/14 06:45:17 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -570,16 +570,10 @@ _icmp6_input(struct mbuf *m, int off, in
case ICMP6_DST_UNREACH_ADDR:
code = PRC_HOSTDEAD;
break;
-#ifdef COMPAT_RFC1885
- case ICMP6_DST_UNREACH_NOTNEIGHBOR:
- code = PRC_UNREACH_SRCFAIL;
- break;
-#else
case ICMP6_DST_UNREACH_BEYONDSCOPE:
/* I mean "source address was incorrect." */
code = PRC_UNREACH_NET;
break;
-#endif
case ICMP6_DST_UNREACH_NOPORT:
code = PRC_UNREACH_PORT;
break;