Module Name: src Committed By: snj Date: Thu Jul 26 23:55:31 UTC 2018
Modified Files: src/sys/arch/acorn32/podulebus [netbsd-8]: if_ie.c src/sys/arch/amiga/dev [netbsd-8]: if_es.c if_qn.c src/sys/arch/arm/at91 [netbsd-8]: at91emac.c src/sys/arch/arm/ep93xx [netbsd-8]: epe.c src/sys/arch/emips/ebus [netbsd-8]: if_le_ebus.c src/sys/arch/mac68k/dev [netbsd-8]: if_mc.c src/sys/arch/macppc/dev [netbsd-8]: am79c950.c src/sys/arch/newsmips/apbus [netbsd-8]: if_sn.c src/sys/arch/next68k/dev [netbsd-8]: mb8795.c src/sys/arch/playstation2/dev [netbsd-8]: if_smap.c src/sys/arch/sun2/dev [netbsd-8]: if_ec.c src/sys/arch/sun3/dev [netbsd-8]: if_ie.c src/sys/arch/x68k/dev [netbsd-8]: if_ne_intio.c src/sys/arch/xen/xen [netbsd-8]: if_xennet_xenbus.c xennetback_xenbus.c src/sys/dev/bi [netbsd-8]: if_ni.c src/sys/dev/cadence [netbsd-8]: if_cemac.c src/sys/dev/ic [netbsd-8]: am7990.c am79900.c an.c cs89x0.c dm9000.c dp8390.c elink3.c elinkxl.c hme.c i82586.c lance.c mb86950.c mb86960.c mtd803.c pdq_ifsubr.c rrunner.c seeq8005.c sgec.c smc90cx6.c smc91cxx.c tropic.c wi.c src/sys/dev/isa [netbsd-8]: if_eg.c if_el.c if_iy.c src/sys/dev/ofw [netbsd-8]: ofnet.c src/sys/dev/pci [netbsd-8]: if_alc.c if_de.c if_fpa.c if_jme.c if_tl.c if_vte.c src/sys/dev/pci/ixgbe [netbsd-8]: ixgbe.h src/sys/dev/pcmcia [netbsd-8]: if_cnw.c if_malo_pcmcia.c if_ray.c if_xi.c mhzc.c xirc.c src/sys/dev/qbus [netbsd-8]: if_de.c if_qe.c if_qt.c src/sys/dev/sbus [netbsd-8]: be.c qe.c src/sys/dev/scsipi [netbsd-8]: if_se.c src/sys/dev/usb [netbsd-8]: if_atu.c src/sys/net [netbsd-8]: if_l2tp.c if_ppp.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.39.6.1 src/sys/arch/acorn32/podulebus/if_ie.c cvs rdiff -u -r1.57 -r1.57.6.1 src/sys/arch/amiga/dev/if_es.c cvs rdiff -u -r1.44 -r1.44.6.1 src/sys/arch/amiga/dev/if_qn.c cvs rdiff -u -r1.19 -r1.19.6.1 src/sys/arch/arm/at91/at91emac.c cvs rdiff -u -r1.36 -r1.36.6.1 src/sys/arch/arm/ep93xx/epe.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/emips/ebus/if_le_ebus.c cvs rdiff -u -r1.45 -r1.45.6.1 src/sys/arch/mac68k/dev/if_mc.c cvs rdiff -u -r1.38 -r1.38.6.1 src/sys/arch/macppc/dev/am79c950.c cvs rdiff -u -r1.38.6.1 -r1.38.6.2 src/sys/arch/newsmips/apbus/if_sn.c cvs rdiff -u -r1.58 -r1.58.6.1 src/sys/arch/next68k/dev/mb8795.c cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/playstation2/dev/if_smap.c cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/arch/sun2/dev/if_ec.c cvs rdiff -u -r1.62 -r1.62.6.1 src/sys/arch/sun3/dev/if_ie.c cvs rdiff -u -r1.18 -r1.18.10.1 src/sys/arch/x68k/dev/if_ne_intio.c cvs rdiff -u -r1.70 -r1.70.6.1 src/sys/arch/xen/xen/if_xennet_xenbus.c cvs rdiff -u -r1.58.8.1 -r1.58.8.2 src/sys/arch/xen/xen/xennetback_xenbus.c cvs rdiff -u -r1.44 -r1.44.8.1 src/sys/dev/bi/if_ni.c cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/dev/cadence/if_cemac.c cvs rdiff -u -r1.77 -r1.77.2.1 src/sys/dev/ic/am7990.c cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/dev/ic/am79900.c cvs rdiff -u -r1.65.2.1 -r1.65.2.2 src/sys/dev/ic/an.c cvs rdiff -u -r1.39 -r1.39.6.1 src/sys/dev/ic/cs89x0.c cvs rdiff -u -r1.11.8.1 -r1.11.8.2 src/sys/dev/ic/dm9000.c cvs rdiff -u -r1.87 -r1.87.2.1 src/sys/dev/ic/dp8390.c cvs rdiff -u -r1.140 -r1.140.8.1 src/sys/dev/ic/elink3.c cvs rdiff -u -r1.121 -r1.121.6.1 src/sys/dev/ic/elinkxl.c cvs rdiff -u -r1.96.2.1 -r1.96.2.2 src/sys/dev/ic/hme.c cvs rdiff -u -r1.76 -r1.76.6.1 src/sys/dev/ic/i82586.c cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/dev/ic/lance.c cvs rdiff -u -r1.26 -r1.26.6.1 src/sys/dev/ic/mb86950.c cvs rdiff -u -r1.85 -r1.85.2.1 src/sys/dev/ic/mb86960.c cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/dev/ic/mtd803.c cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/dev/ic/pdq_ifsubr.c cvs rdiff -u -r1.83 -r1.83.8.1 src/sys/dev/ic/rrunner.c cvs rdiff -u -r1.57 -r1.57.8.1 src/sys/dev/ic/seeq8005.c cvs rdiff -u -r1.46 -r1.46.2.1 src/sys/dev/ic/sgec.c cvs rdiff -u -r1.70.2.1 -r1.70.2.2 src/sys/dev/ic/smc90cx6.c cvs rdiff -u -r1.95 -r1.95.2.1 src/sys/dev/ic/smc91cxx.c cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/ic/tropic.c cvs rdiff -u -r1.243.6.1 -r1.243.6.2 src/sys/dev/ic/wi.c cvs rdiff -u -r1.92 -r1.92.8.1 src/sys/dev/isa/if_eg.c cvs rdiff -u -r1.94 -r1.94.8.1 src/sys/dev/isa/if_el.c cvs rdiff -u -r1.100 -r1.100.6.1 src/sys/dev/isa/if_iy.c cvs rdiff -u -r1.57 -r1.57.8.1 src/sys/dev/ofw/ofnet.c cvs rdiff -u -r1.24.8.1 -r1.24.8.2 src/sys/dev/pci/if_alc.c cvs rdiff -u -r1.150 -r1.150.8.1 src/sys/dev/pci/if_de.c cvs rdiff -u -r1.60 -r1.60.10.1 src/sys/dev/pci/if_fpa.c cvs rdiff -u -r1.31.8.1 -r1.31.8.2 src/sys/dev/pci/if_jme.c cvs rdiff -u -r1.107 -r1.107.2.1 src/sys/dev/pci/if_tl.c cvs rdiff -u -r1.17 -r1.17.2.1 src/sys/dev/pci/if_vte.c cvs rdiff -u -r1.24.6.12 -r1.24.6.13 src/sys/dev/pci/ixgbe/ixgbe.h cvs rdiff -u -r1.61 -r1.61.8.1 src/sys/dev/pcmcia/if_cnw.c cvs rdiff -u -r1.13.6.2 -r1.13.6.3 src/sys/dev/pcmcia/if_malo_pcmcia.c cvs rdiff -u -r1.86 -r1.86.8.1 src/sys/dev/pcmcia/if_ray.c cvs rdiff -u -r1.80 -r1.80.8.1 src/sys/dev/pcmcia/if_xi.c cvs rdiff -u -r1.50 -r1.50.30.1 src/sys/dev/pcmcia/mhzc.c cvs rdiff -u -r1.33 -r1.33.40.1 src/sys/dev/pcmcia/xirc.c cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/dev/qbus/if_de.c cvs rdiff -u -r1.77 -r1.77.2.1 src/sys/dev/qbus/if_qe.c cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/dev/qbus/if_qt.c cvs rdiff -u -r1.85.8.1 -r1.85.8.2 src/sys/dev/sbus/be.c cvs rdiff -u -r1.67 -r1.67.8.1 src/sys/dev/sbus/qe.c cvs rdiff -u -r1.94.8.1 -r1.94.8.2 src/sys/dev/scsipi/if_se.c cvs rdiff -u -r1.55.8.1 -r1.55.8.2 src/sys/dev/usb/if_atu.c cvs rdiff -u -r1.11.2.8 -r1.11.2.9 src/sys/net/if_l2tp.c cvs rdiff -u -r1.158 -r1.158.8.1 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.