Module Name: src
Committed By: snj
Date: Fri May 15 03:58:06 UTC 2015
Modified Files:
src/sys/netinet6 [netbsd-7]: scope6.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #770):
sys/netinet6/scope6.c: revision 1.10
Drop impossible check.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/netinet6/scope6.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/scope6.c
diff -u src/sys/netinet6/scope6.c:1.9 src/sys/netinet6/scope6.c:1.9.2.1
--- src/sys/netinet6/scope6.c:1.9 Sat May 17 21:26:20 2014
+++ src/sys/netinet6/scope6.c Fri May 15 03:58:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: scope6.c,v 1.9 2014/05/17 21:26:20 rmind Exp $ */
+/* $NetBSD: scope6.c,v 1.9.2.1 2015/05/15 03:58:06 snj Exp $ */
/* $KAME$ */
/*-
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.9 2014/05/17 21:26:20 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.9.2.1 2015/05/15 03:58:06 snj Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -411,9 +411,6 @@ in6_setscope(struct in6_addr *in6, const
scope = in6_addrscope(in6);
- if (!sid->s6id_list)
- return 0;
-
switch (scope) {
case IPV6_ADDR_SCOPE_INTFACELOCAL: /* should be interface index */
zoneid = sid->s6id_list[IPV6_ADDR_SCOPE_INTFACELOCAL];
