Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/sys Pull up following revision(s) (requested by msaitoh i...



details:   https://anonhg.NetBSD.org/src/rev/ecb5dcce62a8
branches:  netbsd-8
changeset: 435156:ecb5dcce62a8
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Jul 26 23:55:28 2018 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #938):
        sys/arch/acorn32/podulebus/if_ie.c: revision 1.41
        sys/arch/amiga/dev/if_es.c: revision 1.58
        sys/arch/amiga/dev/if_qn.c: revision 1.45
        sys/arch/arm/at91/at91emac.c: revision 1.20
        sys/arch/arm/ep93xx/epe.c: revision 1.37
        sys/arch/emips/ebus/if_le_ebus.c: revision 1.14
        sys/arch/emips/ebus/if_le_ebus.c: revision 1.15
        sys/arch/mac68k/dev/if_mc.c: revision 1.46
        sys/arch/macppc/dev/am79c950.c: revision 1.39
        sys/arch/newsmips/apbus/if_sn.c: revision 1.40
        sys/arch/next68k/dev/mb8795.c: revision 1.59
        sys/arch/playstation2/dev/if_smap.c: revision 1.25
        sys/arch/playstation2/dev/if_smap.c: revision 1.26
        sys/arch/sun2/dev/if_ec.c: revision 1.28
        sys/arch/sun3/dev/if_ie.c: revision 1.63
        sys/arch/x68k/dev/if_ne_intio.c: revision 1.19
        sys/arch/xen/xen/if_xennet_xenbus.c: revision 1.75
        sys/arch/xen/xen/xennetback_xenbus.c: revision 1.63
        sys/dev/bi/if_ni.c: revision 1.45
        sys/dev/cadence/if_cemac.c: revision 1.12
        sys/dev/ic/am7990.c: revision 1.78
        sys/dev/ic/am79900.c: revision 1.27
        sys/dev/ic/an.c: revision 1.67
        sys/dev/ic/cs89x0.c: revision 1.40
        sys/dev/ic/dm9000.c: revision 1.13
        sys/dev/ic/dm9000.c: revision 1.14
        sys/dev/ic/dp8390.c: revision 1.88
        sys/dev/ic/elink3.c: revision 1.141
        sys/dev/ic/elinkxl.c: revision 1.122
        sys/dev/ic/hme.c: revision 1.98
        sys/dev/ic/i82586.c: revision 1.77
        sys/dev/ic/lance.c: revision 1.53
        sys/dev/ic/mb86950.c: revision 1.27
        sys/dev/ic/mb86960.c: revision 1.86
        sys/dev/ic/mtd803.c: revision 1.34
        sys/dev/ic/pdq_ifsubr.c: revision 1.59
        sys/dev/ic/rrunner.c: revision 1.86
        sys/dev/ic/seeq8005.c: revision 1.58
        sys/dev/ic/sgec.c: revision 1.47
        sys/dev/ic/smc90cx6.c: revision 1.72
        sys/dev/ic/smc91cxx.c: revision 1.96
        sys/dev/ic/tropic.c: revision 1.49
        sys/dev/ic/wi.c: revision 1.245
        sys/dev/isa/if_eg.c: revision 1.93
        sys/dev/isa/if_el.c: revision 1.95
        sys/dev/isa/if_iy.c: revision 1.101
        sys/dev/ofw/ofnet.c: revision 1.58
        sys/dev/pci/if_alc.c: revision 1.27
        sys/dev/pci/if_de.c: revision 1.152
        sys/dev/pci/if_fpa.c: revision 1.61
        sys/dev/pci/if_jme.c: revision 1.34
        sys/dev/pci/if_tl.c: revision 1.108
        sys/dev/pci/if_vte.c: revision 1.19
        sys/dev/pci/ixgbe/ixgbe.h: revision 1.50
        sys/dev/pcmcia/if_cnw.c: revision 1.62
        sys/dev/pcmcia/if_malo_pcmcia.c: revision 1.17
        sys/dev/pcmcia/if_ray.c: revision 1.89
        sys/dev/pcmcia/if_xi.c: revision 1.81
        sys/dev/pcmcia/mhzc.c: revision 1.51
        sys/dev/pcmcia/xirc.c: revision 1.34
        sys/dev/qbus/if_de.c: revision 1.33
        sys/dev/qbus/if_qe.c: revision 1.78
        sys/dev/qbus/if_qt.c: revision 1.22
        sys/dev/sbus/be.c: revision 1.87
        sys/dev/sbus/qe.c: revision 1.68
        sys/dev/scsipi/if_se.c: revision 1.96
        sys/dev/usb/if_atu.c: revision 1.59
        sys/net/if_l2tp.c: revision 1.28 via patch
        sys/net/if_ppp.c: revision 1.160
It's not required to include net/bpfdesc.h. Remove it.
--
Simplify like other drivers. NULL check of ifp->if_bpf is done in
bpf_mtap(), so it's not required to do it here.
--
Remove duplicated inclusion of net/bpf.h.
--
Remove duplicated inclusion of net/bpf.h.
--
Simplify bpf_mtap() call. No functional change.

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     |  11 ++++-------
 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  |  12 ++++--------
 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                  |  10 ++++------
 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_alc.c                 |   7 ++-----
 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/pci/ixgbe/ixgbe.h            |   3 +--
 sys/dev/pcmcia/if_cnw.c              |   8 +++-----
 sys/dev/pcmcia/if_malo_pcmcia.c      |   7 +++----
 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 ++----
 sys/net/if_l2tp.c                    |   5 ++---
 sys/net/if_ppp.c                     |   8 ++------
 66 files changed, 181 insertions(+), 330 deletions(-)

diffs (truncated from 2216 to 300 lines):

diff -r e95db407aa5a -r ecb5dcce62a8 sys/arch/acorn32/podulebus/if_ie.c
--- a/sys/arch/acorn32/podulebus/if_ie.c        Thu Jul 26 23:45:09 2018 +0000
+++ b/sys/arch/acorn32/podulebus/if_ie.c        Thu Jul 26 23:55:28 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.39 2017/02/22 09:45:15 nonaka Exp $ */
+/* $NetBSD: if_ie.c,v 1.39.6.1 2018/07/26 23:55:28 snj Exp $ */
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.39 2017/02/22 09:45:15 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.39.6.1 2018/07/26 23:55:28 snj 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 e95db407aa5a -r ecb5dcce62a8 sys/arch/amiga/dev/if_es.c
--- a/sys/arch/amiga/dev/if_es.c        Thu Jul 26 23:45:09 2018 +0000
+++ b/sys/arch/amiga/dev/if_es.c        Thu Jul 26 23:55:28 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.57.6.1 2018/07/26 23:55:28 snj 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.57.6.1 2018/07/26 23:55:28 snj 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 e95db407aa5a -r ecb5dcce62a8 sys/arch/amiga/dev/if_qn.c
--- a/sys/arch/amiga/dev/if_qn.c        Thu Jul 26 23:45:09 2018 +0000
+++ b/sys/arch/amiga/dev/if_qn.c        Thu Jul 26 23:55:28 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.44.6.1 2018/07/26 23:55:28 snj 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.44.6.1 2018/07/26 23:55:28 snj 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 e95db407aa5a -r ecb5dcce62a8 sys/arch/arm/at91/at91emac.c
--- a/sys/arch/arm/at91/at91emac.c      Thu Jul 26 23:45:09 2018 +0000
+++ b/sys/arch/arm/at91/at91emac.c      Thu Jul 26 23:55:28 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.19.6.1 2018/07/26 23:55:28 snj Exp $        */
+/*     $NetBSD: at91emac.c,v 1.19.6.1 2018/07/26 23:55:28 snj 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.19.6.1 2018/07/26 23:55:28 snj 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 e95db407aa5a -r ecb5dcce62a8 sys/arch/arm/ep93xx/epe.c
--- a/sys/arch/arm/ep93xx/epe.c Thu Jul 26 23:45:09 2018 +0000
+++ b/sys/arch/arm/ep93xx/epe.c Thu Jul 26 23:55:28 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.36.6.1 2018/07/26 23:55:28 snj 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.36.6.1 2018/07/26 23:55:28 snj 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 e95db407aa5a -r ecb5dcce62a8 sys/arch/emips/ebus/if_le_ebus.c
--- a/sys/arch/emips/ebus/if_le_ebus.c  Thu Jul 26 23:45:09 2018 +0000
+++ b/sys/arch/emips/ebus/if_le_ebus.c  Thu Jul 26 23:55:28 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.13.8.1 2018/07/26 23:55:28 snj 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.13.8.1 2018/07/26 23:55:28 snj 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>
@@ -875,8 +873,7 @@
                 * If BPF is listening on this interface, let it see the packet
                 * before we commit it to the wire.
                 */
-               if (ifp->if_bpf)
-                       bpf_mtap(ifp, m);
+               bpf_mtap(ifp, m);
 
                /*
                 * Copy the mbuf chain into a contiguous transmit buffer.
diff -r e95db407aa5a -r ecb5dcce62a8 sys/arch/mac68k/dev/if_mc.c
--- a/sys/arch/mac68k/dev/if_mc.c       Thu Jul 26 23:45:09 2018 +0000
+++ b/sys/arch/mac68k/dev/if_mc.c       Thu Jul 26 23:55:28 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.45.6.1 2018/07/26 23:55:28 snj 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.45.6.1 2018/07/26 23:55:28 snj 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 e95db407aa5a -r ecb5dcce62a8 sys/arch/macppc/dev/am79c950.c
--- a/sys/arch/macppc/dev/am79c950.c    Thu Jul 26 23:45:09 2018 +0000
+++ b/sys/arch/macppc/dev/am79c950.c    Thu Jul 26 23:55:28 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.38.6.1 2018/07/26 23:55:28 snj 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.38.6.1 2018/07/26 23:55:28 snj 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 e95db407aa5a -r ecb5dcce62a8 sys/arch/newsmips/apbus/if_sn.c
--- a/sys/arch/newsmips/apbus/if_sn.c   Thu Jul 26 23:45:09 2018 +0000
+++ b/sys/arch/newsmips/apbus/if_sn.c   Thu Jul 26 23:55:28 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_sn.c,v 1.38.6.1 2017/08/05 04:17:03 snj Exp $       */
+/*     $NetBSD: if_sn.c,v 1.38.6.2 2018/07/26 23:55:29 snj Exp $       */
 
 /*
  * National Semiconductor  DP8393X SONIC Driver



Home | Main Index | Thread Index | Old Index