Module Name: src
Committed By: knakahara
Date: Tue Apr 4 23:49:18 UTC 2017
Modified Files:
src/sys/net: if_l2tp.c
src/sys/netinet6: in6_l2tp.c
Log Message:
fix module build
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.4 -r1.5 src/sys/netinet6/in6_l2tp.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_l2tp.c
diff -u src/sys/net/if_l2tp.c:1.7 src/sys/net/if_l2tp.c:1.8
--- src/sys/net/if_l2tp.c:1.7 Tue Apr 4 16:49:15 2017
+++ src/sys/net/if_l2tp.c Tue Apr 4 23:49:17 2017
@@ -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
#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, in
mutex_exit(&sc->l2tp_lock);
#ifdef NOTYET
-#if NVLAN > 0
vlan_linkstate_notify(ifp, ifp->if_link_state);
#endif
-#endif
}
static int
Index: src/sys/netinet6/in6_l2tp.c
diff -u src/sys/netinet6/in6_l2tp.c:1.4 src/sys/netinet6/in6_l2tp.c:1.5
--- src/sys/netinet6/in6_l2tp.c:1.4 Tue Apr 4 16:49:15 2017
+++ src/sys/netinet6/in6_l2tp.c Tue Apr 4 23:49:18 2017
@@ -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
#include <altq/altq.h>
#endif
-#include <net/if_vlanvar.h>
-
/* TODO: IP_TCPMSS support */
#undef IP_TCPMSS
#ifdef IP_TCPMSS
