[src/trunk]: src/sys It's not required to include net/bpfdesc.h. Remove it.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys It's not required to include net/bpfdesc.h. Remove it.
From: msaitoh <msaitoh%NetBSD.org@localhost>
Date: Fri, 22 Jun 2018 06:47:22 +0000
details:   https://anonhg.NetBSD.org/src/rev/222570804473
branches:  trunk
changeset: 320070:222570804473
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Jun 22 04:17:40 2018 +0000

description:
It's not required to include net/bpfdesc.h. Remove it.

diffstat:

 sys/arch/acorn32/podulebus/if_ie.c   |   5 ++---
 sys/arch/amiga/dev/if_es.c           |   8 +++-----
 sys/arch/amiga/dev/if_qn.c           |   8 +++-----
 sys/arch/arm/at91/at91emac.c         |  10 ++++------
 sys/arch/arm/ep93xx/epe.c            |   8 +++-----
 sys/arch/emips/ebus/if_le_ebus.c     |   8 +++-----
 sys/arch/mac68k/dev/if_mc.c          |  10 +++-------
 sys/arch/macppc/dev/am79c950.c       |   8 +++-----
 sys/arch/newsmips/apbus/if_sn.c      |   8 +++-----
 sys/arch/next68k/dev/mb8795.c        |  11 +++--------
 sys/arch/playstation2/dev/if_smap.c  |   9 +++------
 sys/arch/sun2/dev/if_ec.c            |   9 +++------
 sys/arch/sun3/dev/if_ie.c            |   6 ++----
 sys/arch/x68k/dev/if_ne_intio.c      |   5 ++---
 sys/arch/xen/xen/if_xennet_xenbus.c  |   5 ++---
 sys/arch/xen/xen/xennetback_xenbus.c |   5 ++---
 sys/dev/bi/if_ni.c                   |   8 +++-----
 sys/dev/cadence/if_cemac.c           |   8 +++-----
 sys/dev/ic/am7990.c                  |   6 ++----
 sys/dev/ic/am79900.c                 |   6 ++----
 sys/dev/ic/an.c                      |   8 +++-----
 sys/dev/ic/cs89x0.c                  |   9 ++++-----
 sys/dev/ic/dm9000.c                  |   7 +++----
 sys/dev/ic/dp8390.c                  |   8 +++-----
 sys/dev/ic/elink3.c                  |   6 ++----
 sys/dev/ic/elinkxl.c                 |   6 ++----
 sys/dev/ic/hme.c                     |   9 +++------
 sys/dev/ic/i82586.c                  |   6 ++----
 sys/dev/ic/lance.c                   |   7 ++-----
 sys/dev/ic/mb86950.c                 |   9 +++------
 sys/dev/ic/mb86960.c                 |   9 +++------
 sys/dev/ic/mtd803.c                  |   8 +++-----
 sys/dev/ic/pdq_ifsubr.c              |   8 +++-----
 sys/dev/ic/rrunner.c                 |   9 +++------
 sys/dev/ic/seeq8005.c                |   6 ++----
 sys/dev/ic/sgec.c                    |   8 +++-----
 sys/dev/ic/smc90cx6.c                |   8 +++-----
 sys/dev/ic/smc91cxx.c                |   8 +++-----
 sys/dev/ic/tropic.c                  |   9 +++------
 sys/dev/ic/wi.c                      |   8 +++-----
 sys/dev/isa/if_eg.c                  |   9 +++------
 sys/dev/isa/if_el.c                  |   9 +++------
 sys/dev/isa/if_iy.c                  |   8 +++-----
 sys/dev/ofw/ofnet.c                  |   8 +++-----
 sys/dev/pci/if_de.c                  |   8 +++-----
 sys/dev/pci/if_fpa.c                 |   6 ++----
 sys/dev/pci/if_jme.c                 |   6 ++----
 sys/dev/pci/if_tl.c                  |   6 ++----
 sys/dev/pci/if_vte.c                 |   6 ++----
 sys/dev/pcmcia/if_cnw.c              |   8 +++-----
 sys/dev/pcmcia/if_ray.c              |   8 +++-----
 sys/dev/pcmcia/if_xi.c               |   8 +++-----
 sys/dev/pcmcia/mhzc.c                |   9 +++------
 sys/dev/pcmcia/xirc.c                |   9 +++------
 sys/dev/qbus/if_de.c                 |   8 +++-----
 sys/dev/qbus/if_qe.c                 |   8 +++-----
 sys/dev/qbus/if_qt.c                 |   9 +++------
 sys/dev/sbus/be.c                    |   9 +++------
 sys/dev/sbus/qe.c                    |   9 +++------
 sys/dev/scsipi/if_se.c               |   8 +++-----
 sys/dev/usb/if_atu.c                 |   6 ++----
 61 files changed, 168 insertions(+), 304 deletions(-)

diffs (truncated from 2045 to 300 lines):

diff -r a4fadf70be3b -r 222570804473 sys/arch/acorn32/podulebus/if_ie.c
--- a/sys/arch/acorn32/podulebus/if_ie.c        Fri Jun 22 02:51:17 2018 +0000
+++ b/sys/arch/acorn32/podulebus/if_ie.c        Fri Jun 22 04:17:40 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.40 2017/06/25 12:07:23 maxv Exp $ */
+/* $NetBSD: if_ie.c,v 1.41 2018/06/22 04:17:40 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.40 2017/06/25 12:07:23 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.41 2018/06/22 04:17:40 msaitoh Exp $");
 
 #define IGNORE_ETHER1_IDROM_CHECKSUM
 
@@ -101,7 +101,6 @@
 /* BPF support */
 
 #include <net/bpf.h>
-#include <net/bpfdesc.h>
 
 /* Some useful defines and macros */
 
diff -r a4fadf70be3b -r 222570804473 sys/arch/amiga/dev/if_es.c
--- a/sys/arch/amiga/dev/if_es.c        Fri Jun 22 02:51:17 2018 +0000
+++ b/sys/arch/amiga/dev/if_es.c        Fri Jun 22 04:17:40 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_es.c,v 1.57 2017/02/22 09:45:15 nonaka Exp $ */
+/*     $NetBSD: if_es.c,v 1.58 2018/06/22 04:17:40 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1995 Michael L. Hitch
@@ -33,7 +33,7 @@
 #include "opt_ns.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.57 2017/02/22 09:45:15 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.58 2018/06/22 04:17:40 msaitoh Exp $");
 
 
 #include <sys/param.h>
@@ -51,6 +51,7 @@
 #include <net/if_dl.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
+#include <net/bpf.h>
 
 #ifdef INET
 #include <netinet/in.h>
@@ -92,9 +93,6 @@
 #endif
 };
 
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
 #ifdef ESDEBUG
 /* console error messages */
 int    esdebug = 0;
diff -r a4fadf70be3b -r 222570804473 sys/arch/amiga/dev/if_qn.c
--- a/sys/arch/amiga/dev/if_qn.c        Fri Jun 22 02:51:17 2018 +0000
+++ b/sys/arch/amiga/dev/if_qn.c        Fri Jun 22 04:17:40 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_qn.c,v 1.44 2017/02/22 09:45:15 nonaka Exp $ */
+/*     $NetBSD: if_qn.c,v 1.45 2018/06/22 04:17:40 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1995 Mika Kortelainen
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.44 2017/02/22 09:45:15 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.45 2018/06/22 04:17:40 msaitoh Exp $");
 
 #include "qn.h"
 #if NQN > 0
@@ -98,6 +98,7 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
+#include <net/bpf.h>
 
 #ifdef INET
 #include <netinet/in.h>
@@ -143,9 +144,6 @@
        u_char  transmit_pending;
 } qn_softc[NQN];
 
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
 
 int    qnmatch(device_t, cfdata_t, void *);
 void   qnattach(device_t, device_t, void *);
diff -r a4fadf70be3b -r 222570804473 sys/arch/arm/at91/at91emac.c
--- a/sys/arch/arm/at91/at91emac.c      Fri Jun 22 02:51:17 2018 +0000
+++ b/sys/arch/arm/at91/at91emac.c      Fri Jun 22 04:17:40 2018 +0000
@@ -1,5 +1,5 @@
-/*     $Id: at91emac.c,v 1.19 2017/02/20 08:25:57 ozaki-r Exp $        */
-/*     $NetBSD: at91emac.c,v 1.19 2017/02/20 08:25:57 ozaki-r Exp $    */
+/*     $Id: at91emac.c,v 1.20 2018/06/22 04:17:40 msaitoh Exp $        */
+/*     $NetBSD: at91emac.c,v 1.20 2018/06/22 04:17:40 msaitoh Exp $    */
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.19 2017/02/20 08:25:57 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.20 2018/06/22 04:17:40 msaitoh Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -56,6 +56,7 @@
 #include <net/if_types.h>
 #include <net/if_media.h>
 #include <net/if_ether.h>
+#include <net/bpf.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
@@ -68,9 +69,6 @@
 #include <netinet/if_inarp.h>
 #endif
 
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
 #ifdef IPKDB_AT91      // @@@
 #include <ipkdb/ipkdb.h>
 #endif
diff -r a4fadf70be3b -r 222570804473 sys/arch/arm/ep93xx/epe.c
--- a/sys/arch/arm/ep93xx/epe.c Fri Jun 22 02:51:17 2018 +0000
+++ b/sys/arch/arm/ep93xx/epe.c Fri Jun 22 04:17:40 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epe.c,v 1.36 2017/02/22 09:45:15 nonaka Exp $  */
+/*     $NetBSD: epe.c,v 1.37 2018/06/22 04:17:40 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.36 2017/02/22 09:45:15 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.37 2018/06/22 04:17:40 msaitoh Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -53,6 +53,7 @@
 #include <net/if_types.h>
 #include <net/if_media.h>
 #include <net/if_ether.h>
+#include <net/bpf.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
@@ -65,9 +66,6 @@
 #include <netinet/if_inarp.h>
 #endif
 
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
 #include <arm/ep93xx/ep93xxreg.h>
 #include <arm/ep93xx/epereg.h> 
 #include <arm/ep93xx/epevar.h> 
diff -r a4fadf70be3b -r 222570804473 sys/arch/emips/ebus/if_le_ebus.c
--- a/sys/arch/emips/ebus/if_le_ebus.c  Fri Jun 22 02:51:17 2018 +0000
+++ b/sys/arch/emips/ebus/if_le_ebus.c  Fri Jun 22 04:17:40 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_le_ebus.c,v 1.13 2016/12/15 09:28:02 ozaki-r Exp $  */
+/*     $NetBSD: if_le_ebus.c,v 1.14 2018/06/22 04:17:40 msaitoh Exp $  */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.13 2016/12/15 09:28:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.14 2018/06/22 04:17:40 msaitoh Exp $");
 
 #include "opt_inet.h"
 
@@ -51,15 +51,13 @@
 #include <net/if_dl.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
+#include <net/bpf.h>
 
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_inarp.h>
 #endif
 
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
 #include <sys/rndsource.h>
 
 #include <emips/ebus/ebusvar.h>
diff -r a4fadf70be3b -r 222570804473 sys/arch/mac68k/dev/if_mc.c
--- a/sys/arch/mac68k/dev/if_mc.c       Fri Jun 22 02:51:17 2018 +0000
+++ b/sys/arch/mac68k/dev/if_mc.c       Fri Jun 22 04:17:40 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_mc.c,v 1.45 2017/02/22 09:45:16 nonaka Exp $        */
+/*     $NetBSD: if_mc.c,v 1.46 2018/06/22 04:17:40 msaitoh Exp $       */
 
 /*-
  * Copyright (c) 1997 David Huang <khym%azeotrope.org@localhost>
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.45 2017/02/22 09:45:16 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.46 2018/06/22 04:17:40 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_inet.h"
@@ -56,6 +56,7 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
+#include <net/bpf.h>
 
 #ifdef INET
 #include <netinet/in.h>
@@ -65,11 +66,6 @@
 #include <netinet/ip.h>
 #endif
 
-
-
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
 #include <machine/bus.h>
 #include <mac68k/dev/if_mcreg.h>
 #include <mac68k/dev/if_mcvar.h>
diff -r a4fadf70be3b -r 222570804473 sys/arch/macppc/dev/am79c950.c
--- a/sys/arch/macppc/dev/am79c950.c    Fri Jun 22 02:51:17 2018 +0000
+++ b/sys/arch/macppc/dev/am79c950.c    Fri Jun 22 04:17:40 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: am79c950.c,v 1.38 2017/02/22 09:45:16 nonaka Exp $     */
+/*     $NetBSD: am79c950.c,v 1.39 2018/06/22 04:17:41 msaitoh Exp $    */
 
 /*-
  * Copyright (c) 1997 David Huang <khym%bga.com@localhost>
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.38 2017/02/22 09:45:16 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.39 2018/06/22 04:17:41 msaitoh Exp $");
 
 #include "opt_inet.h"
 
@@ -54,6 +54,7 @@
 #include <net/if_dl.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
+#include <net/bpf.h>
 
 #ifdef INET
 #include <netinet/in.h>
@@ -63,9 +64,6 @@
 #include <netinet/ip.h>
 #endif
 
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-
 #include <sys/bus.h>
 
 #include <macppc/dev/am79c950reg.h>
diff -r a4fadf70be3b -r 222570804473 sys/arch/newsmips/apbus/if_sn.c
--- a/sys/arch/newsmips/apbus/if_sn.c   Fri Jun 22 02:51:17 2018 +0000
+++ b/sys/arch/newsmips/apbus/if_sn.c   Fri Jun 22 04:17:40 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_sn.c,v 1.39 2017/07/29 02:21:30 riastradh Exp $     */
+/*     $NetBSD: if_sn.c,v 1.40 2018/06/22 04:17:41 msaitoh Exp $       */
 
 /*
  * National Semiconductor  DP8393X SONIC Driver
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.39 2017/07/29 02:21:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.40 2018/06/22 04:17:41 msaitoh Exp $");
 
 #include "opt_inet.h"
 
@@ -34,6 +34,7 @@
Prev by Date: [src/trunk]: src/sys Simplify like other drivers. NULL check of ifp->if_bpf i...
Next by Date: [src/trunk]: src/sys/arch Revert jdolecek's changes related to FXSAVE. They j...
Previous by Thread: [src/trunk]: src/sys Simplify like other drivers. NULL check of ifp->if_bpf i...
Next by Thread: [src/trunk]: src/sys/arch Revert jdolecek's changes related to FXSAVE. They j...
Indexes:
Home | Main Index | Thread Index | Old Index