[src/trunk]: src/sys Revert change to allow builds to continue until the miss...

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

details:   https://anonhg.NetBSD.org/src/rev/c712884861d6
branches:  trunk
changeset: 352492:c712884861d6
user:      sevan <sevan%NetBSD.org@localhost>
date:      Tue Apr 04 16:49:15 2017 +0000

description:
Revert change to allow builds to continue until the missing vlan.h file is committed.
https://mail-index.netbsd.org/source-changes/2017/04/04/msg083283.html

diffstat:

 sys/net/if_l2tp.c       |  11 +++--------
 sys/netinet6/in6_l2tp.c |   6 ++++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diffs (85 lines):

diff -r b92dda9c1a73 -r c712884861d6 sys/net/if_l2tp.c
--- a/sys/net/if_l2tp.c Tue Apr 04 12:25:40 2017 +0000
+++ b/sys/net/if_l2tp.c Tue Apr 04 16:49:15 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_l2tp.c,v 1.6 2017/04/04 10:25:38 knakahara Exp $    */
+/*     $NetBSD: if_l2tp.c,v 1.7 2017/04/04 16:49:15 sevan Exp $        */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,14 +31,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.6 2017/04/04 10:25:38 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.7 2017/04/04 16:49:15 sevan Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 
-#include "vlan.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -69,6 +67,7 @@
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/bpf.h>
+#include <net/if_vlanvar.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -1391,16 +1390,13 @@
 
        if (l2tp_need_tcpmss_clamp(ifp)) {
                struct ether_header *eh;
-#if NVLAN > 0
                struct ether_vlan_header evh;
-#endif
 
                /* save ether header */
                m_copydata(m, 0, sizeof(evh), (void *)&evh);
                eh = (struct ether_header *)&evh;
 
                switch (ntohs(eh->ether_type)) {
-#if NVLAN > 0
                case ETHERTYPE_VLAN: /* Ether + VLAN */
                        if (m->m_pkthdr.len <= sizeof(struct ether_vlan_header))
                                break;
@@ -1430,7 +1426,6 @@
                                return NULL;
                        *mtod(m, struct ether_vlan_header *) = evh;
                        break;
-#endif /* NVLAN > 0 */
 #ifdef INET
                case ETHERTYPE_IP: /* Ether + IPv4 */
                        if (m->m_pkthdr.len <= sizeof(struct ether_header))
diff -r b92dda9c1a73 -r c712884861d6 sys/netinet6/in6_l2tp.c
--- a/sys/netinet6/in6_l2tp.c   Tue Apr 04 12:25:40 2017 +0000
+++ b/sys/netinet6/in6_l2tp.c   Tue Apr 04 16:49:15 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_l2tp.c,v 1.3 2017/04/04 10:25:38 knakahara Exp $   */
+/*     $NetBSD: in6_l2tp.c,v 1.4 2017/04/04 16:49:15 sevan Exp $       */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.3 2017/04/04 10:25:38 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.4 2017/04/04 16:49:15 sevan Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_l2tp.h"
@@ -64,6 +64,8 @@
 #include <altq/altq.h>
 #endif
 
+#include <net/if_vlanvar.h>
+
 /* TODO: IP_TCPMSS support */
 #undef IP_TCPMSS
 #ifdef IP_TCPMSS