From 685eeb51f18df5ea47280dd7d6f46351384ac2f0 Mon Sep 17 00:00:00 2001
From: knakahara <knakahara@NetBSD.org>
Date: Tue, 4 Apr 2017 23:49:17 +0000
Subject: [PATCH] fix module build

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

diff --git a/sys/net/if_l2tp.c b/sys/net/if_l2tp.c
index 600c57d056db..247b929a80b0 100644
--- a/sys/net/if_l2tp.c
+++ b/sys/net/if_l2tp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_l2tp.c,v 1.7 2017/04/04 16:49:15 sevan Exp $	*/
+/*	$NetBSD: if_l2tp.c,v 1.8 2017/04/04 23:49:17 knakahara Exp $	*/
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.7 2017/04/04 16:49:15 sevan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.8 2017/04/04 23:49:17 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -83,9 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.7 2017/04/04 16:49:15 sevan Exp $");
 
 #include <net/if_l2tp.h>
 
-#if NVLAN > 0
 #include <net/if_vlanvar.h>
-#endif
 
 /* TODO: IP_TCPMSS support */
 #undef IP_TCPMSS
@@ -1266,10 +1264,8 @@ l2tp_set_state(struct l2tp_softc *sc, int state)
 	mutex_exit(&sc->l2tp_lock);
 
 #ifdef NOTYET
-#if NVLAN > 0
 	vlan_linkstate_notify(ifp, ifp->if_link_state);
 #endif
-#endif
 }
 
 static int
diff --git a/sys/netinet6/in6_l2tp.c b/sys/netinet6/in6_l2tp.c
index 1ed34999ef12..5db00eb83454 100644
--- a/sys/netinet6/in6_l2tp.c
+++ b/sys/netinet6/in6_l2tp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_l2tp.c,v 1.4 2017/04/04 16:49:15 sevan Exp $	*/
+/*	$NetBSD: in6_l2tp.c,v 1.5 2017/04/04 23:49:18 knakahara 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.4 2017/04/04 16:49:15 sevan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.5 2017/04/04 23:49:18 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_l2tp.h"
@@ -64,8 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.4 2017/04/04 16:49:15 sevan Exp $");
 #include <altq/altq.h>
 #endif
 
-#include <net/if_vlanvar.h>
-
 /* TODO: IP_TCPMSS support */
 #undef IP_TCPMSS
 #ifdef IP_TCPMSS