Module Name: src
Committed By: martin
Date: Mon Apr 22 09:06:49 UTC 2019
Modified Files:
src/sys/net [netbsd-8]: if_gif.c
Log Message:
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().
To generate a diff of this commit:
cvs rdiff -u -r1.126.2.13 -r1.126.2.14 src/sys/net/if_gif.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/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.126.2.13 src/sys/net/if_gif.c:1.126.2.14
--- src/sys/net/if_gif.c:1.126.2.13 Mon Nov 12 08:50:18 2018
+++ src/sys/net/if_gif.c Mon Apr 22 09:06:49 2019
@@ -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 @@ gif_set_tunnel(struct ifnet *ifp, struct
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;
