[src/trunk]: src/sys Remove duplicated inclusion of net/bpf.h.

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

details:   https://anonhg.NetBSD.org/src/rev/15063150e94d
branches:  trunk
changeset: 833435:15063150e94d
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Jun 25 04:59:42 2018 +0000

description:
Remove duplicated inclusion of net/bpf.h.

diffstat:

 sys/dev/pci/if_alc.c      |  7 ++-----
 sys/dev/pci/ixgbe/ixgbe.h |  3 +--
 sys/net/if_l2tp.c         |  6 ++----
 sys/net/if_ppp.c          |  8 ++------
 4 files changed, 7 insertions(+), 17 deletions(-)

diffs (114 lines):

diff -r bf8aa7b9f93d -r 15063150e94d sys/dev/pci/if_alc.c
--- a/sys/dev/pci/if_alc.c      Mon Jun 25 03:23:55 2018 +0000
+++ b/sys/dev/pci/if_alc.c      Mon Jun 25 04:59:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_alc.c,v 1.26 2018/06/01 09:34:39 maxv Exp $ */
+/*     $NetBSD: if_alc.c,v 1.27 2018/06/25 05:06:10 msaitoh Exp $      */
 /*     $OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $        */
 /*-
  * Copyright (c) 2009, Pyun YongHyeon <yongari%FreeBSD.org@localhost>
@@ -49,14 +49,13 @@
 
 #include <sys/bus.h>
 
+#include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_llc.h>
 #include <net/if_media.h>
 #include <net/if_ether.h>
 
-#include <net/bpf.h>
-
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -67,8 +66,6 @@
 #include <net/if_types.h>
 #include <net/if_vlanvar.h>
 
-#include <net/bpf.h>
-
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
diff -r bf8aa7b9f93d -r 15063150e94d sys/dev/pci/ixgbe/ixgbe.h
--- a/sys/dev/pci/ixgbe/ixgbe.h Mon Jun 25 03:23:55 2018 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.h Mon Jun 25 04:59:42 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.49 2018/05/23 10:11:07 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.50 2018/06/25 05:06:10 msaitoh Exp $ */
 
 /******************************************************************************
   SPDX-License-Identifier: BSD-3-Clause
@@ -89,7 +89,6 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#include <net/bpf.h>
 #include <net/if_types.h>
 #include <net/if_vlanvar.h>
 
diff -r bf8aa7b9f93d -r 15063150e94d sys/net/if_l2tp.c
--- a/sys/net/if_l2tp.c Mon Jun 25 03:23:55 2018 +0000
+++ b/sys/net/if_l2tp.c Mon Jun 25 04:59:42 2018 +0000
@@ -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 @@
 #include <netinet/ip_tcpmss.h>
 #endif
 
-#include <net/bpf.h>
-
 /*
  * l2tp global variable definitions
  */
diff -r bf8aa7b9f93d -r 15063150e94d sys/net/if_ppp.c
--- a/sys/net/if_ppp.c  Mon Jun 25 03:23:55 2018 +0000
+++ b/sys/net/if_ppp.c  Mon Jun 25 04:59:42 2018 +0000
@@ -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 @@
 #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 @@
 #endif
 
 #include <net/bpf.h>
-
 #include <net/slip.h>
 
 #ifdef VJC