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

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

details:   https://anonhg.NetBSD.org/src/rev/7aa550fb713b
branches:  netbsd-8
changeset: 461024:7aa550fb713b
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Nov 13 12:53:34 2019 +0000

description:
Pull up following revision(s) (requested by yamaguchi in ticket #1434):

        sys/net/if_vlan.c: revision 1.148

Fix a bug that vlan(4) fragments IPv6 packets
even the MTU > packet length.

The bug is appeared when the mtu is increased on SIOCSETVLAN.
>From t-kusaba@IIJ

diffstat:

 sys/net/if_vlan.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r c6229dc2059d -r 7aa550fb713b sys/net/if_vlan.c
--- a/sys/net/if_vlan.c Tue Nov 12 19:24:08 2019 +0000
+++ b/sys/net/if_vlan.c Wed Nov 13 12:53:34 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vlan.c,v 1.97.2.17 2019/10/24 15:48:37 martin Exp $ */
+/*     $NetBSD: if_vlan.c,v 1.97.2.18 2019/11/13 12:53:34 martin Exp $ */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.97.2.17 2019/10/24 15:48:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.97.2.18 2019/11/13 12:53:34 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -119,6 +119,7 @@
 #ifdef INET6
 #include <netinet6/in6_ifattach.h>
 #include <netinet6/in6_var.h>
+#include <netinet6/nd6.h>
 #endif
 
 #include "ioconf.h"
@@ -520,6 +521,12 @@
        nmib->ifvm_p = p;
        nmib->ifvm_tag = vid;
        ifv->ifv_if.if_mtu = p->if_mtu - nmib->ifvm_mtufudge;
+#ifdef INET6
+       KERNEL_LOCK_UNLESS_NET_MPSAFE();
+       if (in6_present)
+               nd6_setmtu(ifp);
+       KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
+#endif
        ifv->ifv_if.if_flags = p->if_flags &
            (IFF_UP | IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);