[src/netbsd-8]: src/sys/net Pull up following revision(s) (requested by knaka...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/47a647ec9c5d
branches:  netbsd-8
changeset: 450689:47a647ec9c5d
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Apr 22 09:06:49 2019 +0000

description:
Pull up following revision(s) (requested by knakahara in ticket #1241):

        sys/net/if_gif.c: revision 1.146

fix a potential bug of gif(4) check for tunnel duplicate.

This problem has not actualized thanks to check for duplicate
in encap_attach().

diffstat:

 sys/net/if_gif.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r c8ed0590ad66 -r 47a647ec9c5d sys/net/if_gif.c
--- a/sys/net/if_gif.c  Mon Apr 22 09:03:55 2019 +0000
+++ b/sys/net/if_gif.c  Mon Apr 22 09:06:49 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_gif.c,v 1.126.2.13 2018/11/12 08:50:18 martin Exp $ */
+/*     $NetBSD: if_gif.c,v 1.126.2.14 2019/04/22 09:06:49 martin Exp $ */
 /*     $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $    */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.126.2.13 2018/11/12 08:50:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.126.2.14 2019/04/22 09:06:49 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1031,7 +1031,7 @@
 
                if (sc2 == sc)
                        continue;
-               var2 = gif_getref_variant(sc, &psref);
+               var2 = gif_getref_variant(sc2, &psref);
                if (!var2->gv_pdst || !var2->gv_psrc) {
                        gif_putref_variant(var2, &psref);
                        continue;