Module Name: src
Committed By: msaitoh
Date: Mon Jun 25 04:59:42 UTC 2018
Modified Files:
src/sys/net: if_l2tp.c if_ppp.c
Log Message:
Remoe duplicated inclusion of net/bpf.h.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.159 -r1.160 src/sys/net/if_ppp.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.27 src/sys/net/if_l2tp.c:1.28
--- src/sys/net/if_l2tp.c:1.27 Tue May 8 06:08:19 2018
+++ src/sys/net/if_l2tp.c Mon Jun 25 04:59:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_l2tp.c,v 1.27 2018/05/08 06:08:19 maxv Exp $ */
+/* $NetBSD: if_l2tp.c,v 1.28 2018/06/25 04:59:42 msaitoh 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.27 2018/05/08 06:08:19 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.28 2018/06/25 04:59:42 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -92,8 +92,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v
#include <netinet/ip_tcpmss.h>
#endif
-#include <net/bpf.h>
-
/*
* l2tp global variable definitions
*/
Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.159 src/sys/net/if_ppp.c:1.160
--- src/sys/net/if_ppp.c:1.159 Sun Sep 17 20:39:04 2017
+++ src/sys/net/if_ppp.c Mon Jun 25 04:59:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.159 2017/09/17 20:39:04 christos Exp $ */
+/* $NetBSD: if_ppp.c,v 1.160 2018/06/25 04:59:42 msaitoh Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.159 2017/09/17 20:39:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.160 2018/06/25 04:59:42 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "ppp.h"
@@ -139,9 +139,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1
#include <net/if_types.h>
#include <net/netisr.h>
#include <net/route.h>
-#ifdef PPP_FILTER
-#include <net/bpf.h>
-#endif
#include <netinet/in.h>
#include <netinet/in_systm.h>
@@ -151,7 +148,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1
#endif
#include <net/bpf.h>
-
#include <net/slip.h>
#ifdef VJC
