[src/trunk]: src/sys fix module build

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

details:   https://anonhg.NetBSD.org/src/rev/9e34e961d136
branches:  trunk
changeset: 822745:9e34e961d136
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Tue Apr 04 23:49:17 2017 +0000

description:
fix module build

diffstat:

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

diffs (66 lines):

diff -r 1f9e0a0646b9 -r 9e34e961d136 sys/net/if_l2tp.c
--- a/sys/net/if_l2tp.c Tue Apr 04 21:07:50 2017 +0000
+++ b/sys/net/if_l2tp.c Tue Apr 04 23:49:17 2017 +0000
@@ -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 @@
 
 #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 @@
        mutex_exit(&sc->l2tp_lock);
 
 #ifdef NOTYET
-#if NVLAN > 0
        vlan_linkstate_notify(ifp, ifp->if_link_state);
 #endif
-#endif
 }
 
 static int
diff -r 1f9e0a0646b9 -r 9e34e961d136 sys/netinet6/in6_l2tp.c
--- a/sys/netinet6/in6_l2tp.c   Tue Apr 04 21:07:50 2017 +0000
+++ b/sys/netinet6/in6_l2tp.c   Tue Apr 04 23:49:17 2017 +0000
@@ -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 @@
 #include <altq/altq.h>
 #endif
 
-#include <net/if_vlanvar.h>
-
 /* TODO: IP_TCPMSS support */
 #undef IP_TCPMSS
 #ifdef IP_TCPMSS