Module Name: src
Committed By: msaitoh
Date: Tue Feb 5 06:17:03 UTC 2019
Modified Files:
src/share/man/man4/man4.vax: ec.4 en.4 ex.4 ix.4 vv.4
src/sys/arch/acorn32/podulebus: if_ie.c
src/sys/arch/amiga/dev: if_es.c if_qn.c
src/sys/arch/arm/at91: at91emac.c
src/sys/arch/arm/ep93xx: epe.c
src/sys/arch/emips/ebus: if_le_ebus.c
src/sys/arch/mac68k/dev: if_mc.c
src/sys/arch/mac68k/nubus: if_netdock_nubus.c
src/sys/arch/macppc/dev: am79c950.c if_bm.c if_gm.c
src/sys/arch/mips/sibyte/dev: sbmac.c
src/sys/arch/newsmips/apbus: if_sn.c
src/sys/arch/next68k/dev: mb8795.c
src/sys/arch/playstation2/dev: if_smap.c
src/sys/arch/sgimips/hpc: if_sq.c
src/sys/arch/sun2/dev: if_ec.c
src/sys/arch/sun3/dev: if_ie.c
src/sys/arch/xen/xen: if_xennet_xenbus.c xennetback_xenbus.c
src/sys/dev/cadence: if_cemac.c
src/sys/dev/ic: an.c atw.c awi.c cs89x0.c dm9000.c dp8390.c elink3.c
elinkxl.c gem.c hme.c i82586.c lance.c lemac.c mb86950.c mb86960.c
pdq_ifsubr.c rrunner.c rtw.c seeq8005.c smc90cx6.c smc91cxx.c
tropic.c wi.c
src/sys/dev/isa: if_eg.c if_el.c if_iy.c
src/sys/dev/ofw: ofnet.c
src/sys/dev/pci: if_cas.c if_de.c if_devar.h if_jme.c if_tl.c if_vte.c
src/sys/dev/pcmcia: if_cnw.c if_xi.c
src/sys/dev/sbus: be.c qe.c
src/sys/dev/scsipi: if_se.c
src/sys/net: if.h if_fddisubr.c if_tokensubr.c
src/usr.sbin/route6d: route6d.c
Log Message:
Remove very old IFF_NOTRAILERS flag.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/share/man/man4/man4.vax/ec.4
cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/man4.vax/en.4 \
src/share/man/man4/man4.vax/vv.4
cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/man4.vax/ex.4
cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/man4.vax/ix.4
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/amiga/dev/if_es.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amiga/dev/if_qn.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/at91/at91emac.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/ep93xx/epe.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/emips/ebus/if_le_ebus.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/mac68k/dev/if_mc.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/mac68k/nubus/if_netdock_nubus.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/macppc/dev/am79c950.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/macppc/dev/if_bm.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/macppc/dev/if_gm.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/mips/sibyte/dev/sbmac.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/newsmips/apbus/if_sn.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/next68k/dev/mb8795.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/playstation2/dev/if_smap.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sgimips/hpc/if_sq.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sun2/dev/if_ec.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/sun3/dev/if_ie.c
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/xen/xen/if_xennet_xenbus.c
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/xen/xen/xennetback_xenbus.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/cadence/if_cemac.c
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/ic/an.c
cvs rdiff -u -r1.164 -r1.165 src/sys/dev/ic/atw.c
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/ic/awi.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/ic/cs89x0.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/dm9000.c
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/ic/dp8390.c
cvs rdiff -u -r1.145 -r1.146 src/sys/dev/ic/elink3.c
cvs rdiff -u -r1.126 -r1.127 src/sys/dev/ic/elinkxl.c
cvs rdiff -u -r1.113 -r1.114 src/sys/dev/ic/gem.c
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/ic/hme.c
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/ic/i82586.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/ic/lance.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/ic/lemac.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/mb86950.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/ic/mb86960.c src/sys/dev/ic/rrunner.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/ic/pdq_ifsubr.c
cvs rdiff -u -r1.129 -r1.130 src/sys/dev/ic/rtw.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/ic/seeq8005.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/ic/smc90cx6.c
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/ic/smc91cxx.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/ic/tropic.c
cvs rdiff -u -r1.249 -r1.250 src/sys/dev/ic/wi.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/isa/if_eg.c
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/isa/if_el.c
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/isa/if_iy.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/ofw/ofnet.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/if_cas.c
cvs rdiff -u -r1.157 -r1.158 src/sys/dev/pci/if_de.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/if_devar.h
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/if_jme.c
cvs rdiff -u -r1.111 -r1.112 src/sys/dev/pci/if_tl.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/if_vte.c
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/pcmcia/if_cnw.c
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/pcmcia/if_xi.c
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/sbus/be.c
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/sbus/qe.c
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/scsipi/if_se.c
cvs rdiff -u -r1.266 -r1.267 src/sys/net/if.h
cvs rdiff -u -r1.110 -r1.111 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.83 -r1.84 src/sys/net/if_tokensubr.c
cvs rdiff -u -r1.72 -r1.73 src/usr.sbin/route6d/route6d.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/man4.vax/ec.4
diff -u src/share/man/man4/man4.vax/ec.4:1.15 src/share/man/man4/man4.vax/ec.4:1.16
--- src/share/man/man4/man4.vax/ec.4:1.15 Tue Aug 1 11:11:17 2017
+++ src/share/man/man4/man4.vax/ec.4 Tue Feb 5 06:17:00 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: ec.4,v 1.15 2017/08/01 11:11:17 wiz Exp $
+.\" $NetBSD: ec.4,v 1.16 2019/02/05 06:17:00 msaitoh Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)ec.4 8.1 (Berkeley) 6/5/93
.\"
-.Dd June 5, 1993
+.Dd February 5, 2019
.Dt EC 4 vax
.Os
.Sh NAME
@@ -70,19 +70,6 @@ interface employs the address resolution
to dynamically map between Internet and Ethernet addresses on the local
network.
.Pp
-The interface normally tries to use a
-.Dq trailer
-encapsulation
-to minimize copying data on input and output.
-The use of trailers is negotiated with
-.Tn ARP .
-This negotiation may be disabled, on a per-interface basis,
-by setting the
-.Dv IFF_NOTRAILERS
-flag with an
-.Dv SIOCSIFFLAGS
-.Xr ioctl 2 .
-.Pp
The interface software implements an exponential backoff algorithm
when notified of a collision on the cable.
This algorithm uses a 16-bit mask and the
Index: src/share/man/man4/man4.vax/en.4
diff -u src/share/man/man4/man4.vax/en.4:1.14 src/share/man/man4/man4.vax/en.4:1.15
--- src/share/man/man4/man4.vax/en.4:1.14 Tue Aug 1 11:11:17 2017
+++ src/share/man/man4/man4.vax/en.4 Tue Feb 5 06:17:00 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: en.4,v 1.14 2017/08/01 11:11:17 wiz Exp $
+.\" $NetBSD: en.4,v 1.15 2019/02/05 06:17:00 msaitoh Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)en.4 8.1 (Berkeley) 6/5/93
.\"
-.Dd June 5, 1993
+.Dd February 5, 2019
.Dt EN 4 vax
.Os
.Sh NAME
@@ -85,21 +85,6 @@ the two's complement of the value).
Use the value calculated in step 3 to delay before retransmitting
the packet.
.El
-The interface handles both Internet and
-.Tn NS
-protocol families.
-It normally tries to use a
-.Dq trailer
-encapsulation
-to minimize copying data on input and output.
-The use of trailers is negotiated with
-.Tn ARP .
-This negotiation may be disabled, on a per-interface basis,
-by setting the
-.Dv IFF_NOTRAILERS
-flag with an
-.Dv SIOCSIFFLAGS
-.Xr ioctl 2 .
.Sh DIAGNOSTICS
.Bl -diag
.It en%d: output error.
Index: src/share/man/man4/man4.vax/vv.4
diff -u src/share/man/man4/man4.vax/vv.4:1.14 src/share/man/man4/man4.vax/vv.4:1.15
--- src/share/man/man4/man4.vax/vv.4:1.14 Tue Aug 1 11:11:17 2017
+++ src/share/man/man4/man4.vax/vv.4 Tue Feb 5 06:17:00 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: vv.4,v 1.14 2017/08/01 11:11:17 wiz Exp $
+.\" $NetBSD: vv.4,v 1.15 2019/02/05 06:17:00 msaitoh Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)vv.4 8.1 (Berkeley) 6/5/93
.\"
-.Dd June 5, 1993
+.Dd February 5, 2019
.Dt VV 4 vax
.Os
.Sh NAME
@@ -73,17 +73,6 @@ instead of the new address of
the define
.Dv OLD_BROADCAST
should be specified in the driver.
-.Pp
-The driver can use
-.Dq trailer
-encapsulation to minimize copying
-data on input and output.
-This may be disabled, on a per-interface basis,
-by setting the
-.Dv IFF_NOTRAILERS
-flag with an
-.Dv SIOCSIFFLAGS
-.Xr ioctl 2 .
.Sh DIAGNOSTICS
.Bl -diag
.It vv%d: host %d.
@@ -120,15 +109,3 @@ The
.Nm
driver appeared in
.Bx 4.2 .
-.Sh BUGS
-The encapsulation of trailer packets in the
-.Bx 4.2
-version of this driver
-was incorrect (the packet type was in
-.Tn VAX
-byte order).
-As a result, the trailer encapsulation in this version is not compatible
-with the
-.Bx 4.2
-.Tn VAX
-version.
Index: src/share/man/man4/man4.vax/ex.4
diff -u src/share/man/man4/man4.vax/ex.4:1.13 src/share/man/man4/man4.vax/ex.4:1.14
--- src/share/man/man4/man4.vax/ex.4:1.13 Tue Aug 1 11:11:17 2017
+++ src/share/man/man4/man4.vax/ex.4 Tue Feb 5 06:17:00 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: ex.4,v 1.13 2017/08/01 11:11:17 wiz Exp $
+.\" $NetBSD: ex.4,v 1.14 2019/02/05 06:17:00 msaitoh Exp $
.\"
.\" Copyright (c) 1986, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)ex.4 8.1 (Berkeley) 6/5/93
.\"
-.Dd June 5, 1993
+.Dd February 5, 2019
.Dt EX 4 vax
.Os
.Sh NAME
@@ -57,19 +57,6 @@ interface employs the address resolution
.Xr arp 4
to dynamically map between Internet and Ethernet addresses on the local
network.
-.Pp
-The interface normally tries to use a
-.Dq trailer
-encapsulation
-to minimize copying data on input and output.
-The use of trailers is negotiated with
-.Tn ARP .
-This negotiation may be disabled, on a per-interface basis,
-by setting the
-.Dv IFF_NOTRAILERS
-flag with an
-.Dv SIOCSIFFLAGS
-.Xr ioctl 2 .
.Sh DIAGNOSTICS
.Bl -diag
.It "ex%d: HW %c.%c, NX %c.%c, hardware address %s."
Index: src/share/man/man4/man4.vax/ix.4
diff -u src/share/man/man4/man4.vax/ix.4:1.20 src/share/man/man4/man4.vax/ix.4:1.21
--- src/share/man/man4/man4.vax/ix.4:1.20 Tue Aug 1 11:11:17 2017
+++ src/share/man/man4/man4.vax/ix.4 Tue Feb 5 06:17:00 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: ix.4,v 1.20 2017/08/01 11:11:17 wiz Exp $
+.\" $NetBSD: ix.4,v 1.21 2019/02/05 06:17:00 msaitoh Exp $
.\"
.\" Copyright (c) 1986, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)ix.4 8.1 (Berkeley) 6/5/93
.\"
-.Dd February 17, 2017
+.Dd February 5, 2019
.Dt IX 4 vax
.Os
.Sh NAME
@@ -70,19 +70,6 @@ interface employs the address resolution
.Xr arp 4
to dynamically map between Internet and Ethernet addresses on the local
network.
-.Pp
-The interface normally tries to use a
-.Dq trailer
-encapsulation
-to minimize copying data on input and output.
-The use of trailers is negotiated with
-.Tn ARP .
-This negotiation may be disabled, on a per-interface basis,
-by setting the
-.Dv IFF_NOTRAILERS
-flag with an
-.Dv SIOCSIFFLAGS
-.Xr ioctl 2 .
.Sh DIAGNOSTICS
.Bl -diag
.It "ix%d: Req failed, cmd %x, stat %x, ust error %x,%x."
Index: src/sys/arch/acorn32/podulebus/if_ie.c
diff -u src/sys/arch/acorn32/podulebus/if_ie.c:1.42 src/sys/arch/acorn32/podulebus/if_ie.c:1.43
--- src/sys/arch/acorn32/podulebus/if_ie.c:1.42 Tue Jun 26 06:47:57 2018
+++ src/sys/arch/acorn32/podulebus/if_ie.c Tue Feb 5 06:17:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.42 2018/06/26 06:47:57 msaitoh Exp $ */
+/* $NetBSD: if_ie.c,v 1.43 2019/02/05 06:17:00 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.42 2018/06/26 06:47:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.43 2019/02/05 06:17:00 msaitoh Exp $");
#define IGNORE_ETHER1_IDROM_CHECKSUM
@@ -447,7 +447,7 @@ ieattach(device_t parent, device_t self,
ifp->if_start = iestart;
ifp->if_ioctl = ieioctl;
ifp->if_watchdog = iewatchdog;
- ifp->if_flags = IFF_BROADCAST | IFF_NOTRAILERS;
+ ifp->if_flags = IFF_BROADCAST;
/* Signed, dated then sent */
if_attach (ifp);
Index: src/sys/arch/amiga/dev/if_es.c
diff -u src/sys/arch/amiga/dev/if_es.c:1.60 src/sys/arch/amiga/dev/if_es.c:1.61
--- src/sys/arch/amiga/dev/if_es.c:1.60 Mon Sep 3 16:29:22 2018
+++ src/sys/arch/amiga/dev/if_es.c Tue Feb 5 06:17:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_es.c,v 1.60 2018/09/03 16:29:22 riastradh Exp $ */
+/* $NetBSD: if_es.c,v 1.61 2019/02/05 06:17:00 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.60 2018/09/03 16:29:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.61 2019/02/05 06:17:00 msaitoh Exp $");
#include <sys/param.h>
@@ -174,8 +174,7 @@ esattach(device_t parent, device_t self,
ifp->if_ioctl = esioctl;
ifp->if_start = esstart;
ifp->if_watchdog = eswatchdog;
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS |
- IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifmedia_init(&sc->sc_media, 0, esmediachange, esmediastatus);
ifmedia_add(&sc->sc_media, IFM_ETHER|IFM_MANUAL, 0, NULL);
Index: src/sys/arch/amiga/dev/if_qn.c
diff -u src/sys/arch/amiga/dev/if_qn.c:1.46 src/sys/arch/amiga/dev/if_qn.c:1.47
--- src/sys/arch/amiga/dev/if_qn.c:1.46 Tue Jun 26 06:47:57 2018
+++ src/sys/arch/amiga/dev/if_qn.c Tue Feb 5 06:17:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qn.c,v 1.46 2018/06/26 06:47:57 msaitoh Exp $ */
+/* $NetBSD: if_qn.c,v 1.47 2019/02/05 06:17:00 msaitoh Exp $ */
/*
* Copyright (c) 1995 Mika Kortelainen
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.46 2018/06/26 06:47:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.47 2019/02/05 06:17:00 msaitoh Exp $");
#include "qn.h"
#if NQN > 0
@@ -230,7 +230,7 @@ qnattach(device_t parent, device_t self,
ifp->if_watchdog = qnwatchdog;
ifp->if_start = qnstart;
/* XXX IFF_MULTICAST */
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
ifp->if_mtu = ETHERMTU;
/* Attach the interface. */
Index: src/sys/arch/arm/at91/at91emac.c
diff -u src/sys/arch/arm/at91/at91emac.c:1.23 src/sys/arch/arm/at91/at91emac.c:1.24
--- src/sys/arch/arm/at91/at91emac.c:1.23 Tue Jan 22 03:42:24 2019
+++ src/sys/arch/arm/at91/at91emac.c Tue Feb 5 06:17:00 2019
@@ -1,5 +1,5 @@
-/* $Id: at91emac.c,v 1.23 2019/01/22 03:42:24 msaitoh Exp $ */
-/* $NetBSD: at91emac.c,v 1.23 2019/01/22 03:42:24 msaitoh Exp $ */
+/* $Id: at91emac.c,v 1.24 2019/02/05 06:17:00 msaitoh Exp $ */
+/* $NetBSD: at91emac.c,v 1.24 2019/02/05 06:17:00 msaitoh Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.23 2019/01/22 03:42:24 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.24 2019/02/05 06:17:00 msaitoh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -479,7 +479,7 @@ emac_init(struct emac_softc *sc)
sc->sc_ec.ec_capabilities |= ETHERCAP_VLAN_MTU;
strcpy(ifp->if_xname, device_xname(sc->sc_dev));
- ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = emac_ifioctl;
ifp->if_start = emac_ifstart;
ifp->if_watchdog = emac_ifwatchdog;
Index: src/sys/arch/arm/ep93xx/epe.c
diff -u src/sys/arch/arm/ep93xx/epe.c:1.39 src/sys/arch/arm/ep93xx/epe.c:1.40
--- src/sys/arch/arm/ep93xx/epe.c:1.39 Tue Jan 22 03:42:25 2019
+++ src/sys/arch/arm/ep93xx/epe.c Tue Feb 5 06:17:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: epe.c,v 1.39 2019/01/22 03:42:25 msaitoh Exp $ */
+/* $NetBSD: epe.c,v 1.40 2019/02/05 06:17:01 msaitoh Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.39 2019/01/22 03:42:25 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.40 2019/02/05 06:17:01 msaitoh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -429,7 +429,7 @@ epe_init(struct epe_softc *sc)
sc->sc_ec.ec_capabilities |= ETHERCAP_VLAN_MTU;
strcpy(ifp->if_xname, device_xname(sc->sc_dev));
- ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = epe_ifioctl;
ifp->if_start = epe_ifstart;
ifp->if_watchdog = epe_ifwatchdog;
Index: src/sys/arch/emips/ebus/if_le_ebus.c
diff -u src/sys/arch/emips/ebus/if_le_ebus.c:1.16 src/sys/arch/emips/ebus/if_le_ebus.c:1.17
--- src/sys/arch/emips/ebus/if_le_ebus.c:1.16 Tue Jun 26 06:47:58 2018
+++ src/sys/arch/emips/ebus/if_le_ebus.c Tue Feb 5 06:17:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_ebus.c,v 1.16 2018/06/26 06:47:58 msaitoh Exp $ */
+/* $NetBSD: if_le_ebus.c,v 1.17 2019/02/05 06:17:01 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.16 2018/06/26 06:47:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.17 2019/02/05 06:17:01 msaitoh Exp $");
#include "opt_inet.h"
@@ -190,8 +190,7 @@ enic_attach(device_t parent, device_t se
ifp->if_watchdog = enic_watchdog;
ifp->if_init = enic_init;
ifp->if_stop = enic_stop;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
/* Initialize ifmedia structures. */
Index: src/sys/arch/mac68k/dev/if_mc.c
diff -u src/sys/arch/mac68k/dev/if_mc.c:1.48 src/sys/arch/mac68k/dev/if_mc.c:1.49
--- src/sys/arch/mac68k/dev/if_mc.c:1.48 Mon Sep 3 16:29:25 2018
+++ src/sys/arch/mac68k/dev/if_mc.c Tue Feb 5 06:17:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mc.c,v 1.48 2018/09/03 16:29:25 riastradh Exp $ */
+/* $NetBSD: if_mc.c,v 1.49 2019/02/05 06:17:01 msaitoh Exp $ */
/*-
* Copyright (c) 1997 David Huang <k...@azeotrope.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.48 2018/09/03 16:29:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.49 2019/02/05 06:17:01 msaitoh Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -151,8 +151,7 @@ mcsetup(struct mc_softc *sc, u_int8_t *l
ifp->if_softc = sc;
ifp->if_ioctl = mcioctl;
ifp->if_start = mcstart;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_watchdog = mcwatchdog;
if_attach(ifp);
Index: src/sys/arch/mac68k/nubus/if_netdock_nubus.c
diff -u src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.28 src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.29
--- src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.28 Mon Sep 3 16:29:25 2018
+++ src/sys/arch/mac68k/nubus/if_netdock_nubus.c Tue Feb 5 06:17:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_netdock_nubus.c,v 1.28 2018/09/03 16:29:25 riastradh Exp $ */
+/* $NetBSD: if_netdock_nubus.c,v 1.29 2019/02/05 06:17:01 msaitoh Exp $ */
/*
* Copyright (C) 2000,2002 Daishi Kato <dai...@axlight.com>
@@ -43,7 +43,7 @@
/***********************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.28 2018/09/03 16:29:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.29 2019/02/05 06:17:01 msaitoh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -361,8 +361,7 @@ netdock_setup(struct netdock_softc *sc,
ifp->if_softc = sc;
ifp->if_ioctl = netdock_ioctl;
ifp->if_start = netdock_start;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_watchdog = netdock_watchdog;
if_attach(ifp);
Index: src/sys/arch/macppc/dev/am79c950.c
diff -u src/sys/arch/macppc/dev/am79c950.c:1.41 src/sys/arch/macppc/dev/am79c950.c:1.42
--- src/sys/arch/macppc/dev/am79c950.c:1.41 Mon Sep 3 16:29:25 2018
+++ src/sys/arch/macppc/dev/am79c950.c Tue Feb 5 06:17:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: am79c950.c,v 1.41 2018/09/03 16:29:25 riastradh Exp $ */
+/* $NetBSD: am79c950.c,v 1.42 2019/02/05 06:17:01 msaitoh Exp $ */
/*-
* Copyright (c) 1997 David Huang <k...@bga.com>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.41 2018/09/03 16:29:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.42 2019/02/05 06:17:01 msaitoh Exp $");
#include "opt_inet.h"
@@ -151,8 +151,7 @@ mcsetup(struct mc_softc *sc, u_int8_t *l
ifp->if_softc = sc;
ifp->if_ioctl = mcioctl;
ifp->if_start = mcstart;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_watchdog = mcwatchdog;
/* initialize ifmedia structures */
Index: src/sys/arch/macppc/dev/if_bm.c
diff -u src/sys/arch/macppc/dev/if_bm.c:1.56 src/sys/arch/macppc/dev/if_bm.c:1.57
--- src/sys/arch/macppc/dev/if_bm.c:1.56 Tue Jan 22 03:42:25 2019
+++ src/sys/arch/macppc/dev/if_bm.c Tue Feb 5 06:17:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bm.c,v 1.56 2019/01/22 03:42:25 msaitoh Exp $ */
+/* $NetBSD: if_bm.c,v 1.57 2019/02/05 06:17:01 msaitoh Exp $ */
/*-
* Copyright (C) 1998, 1999, 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bm.c,v 1.56 2019/01/22 03:42:25 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bm.c,v 1.57 2019/02/05 06:17:01 msaitoh Exp $");
#include "opt_inet.h"
@@ -236,8 +236,7 @@ bmac_attach(device_t parent, device_t se
ifp->if_softc = sc;
ifp->if_ioctl = bmac_ioctl;
ifp->if_start = bmac_start;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_watchdog = bmac_watchdog;
IFQ_SET_READY(&ifp->if_snd);
Index: src/sys/arch/macppc/dev/if_gm.c
diff -u src/sys/arch/macppc/dev/if_gm.c:1.51 src/sys/arch/macppc/dev/if_gm.c:1.52
--- src/sys/arch/macppc/dev/if_gm.c:1.51 Tue Jan 22 03:42:25 2019
+++ src/sys/arch/macppc/dev/if_gm.c Tue Feb 5 06:17:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gm.c,v 1.51 2019/01/22 03:42:25 msaitoh Exp $ */
+/* $NetBSD: if_gm.c,v 1.52 2019/02/05 06:17:01 msaitoh Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gm.c,v 1.51 2019/01/22 03:42:25 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gm.c,v 1.52 2019/02/05 06:17:01 msaitoh Exp $");
#include "opt_inet.h"
@@ -226,8 +226,7 @@ gmac_attach(device_t parent, device_t se
ifp->if_ioctl = gmac_ioctl;
ifp->if_start = gmac_start;
ifp->if_watchdog = gmac_watchdog;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
mii->mii_ifp = ifp;
Index: src/sys/arch/mips/sibyte/dev/sbmac.c
diff -u src/sys/arch/mips/sibyte/dev/sbmac.c:1.53 src/sys/arch/mips/sibyte/dev/sbmac.c:1.54
--- src/sys/arch/mips/sibyte/dev/sbmac.c:1.53 Wed Jan 23 07:40:05 2019
+++ src/sys/arch/mips/sibyte/dev/sbmac.c Tue Feb 5 06:17:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sbmac.c,v 1.53 2019/01/23 07:40:05 msaitoh Exp $ */
+/* $NetBSD: sbmac.c,v 1.54 2019/02/05 06:17:01 msaitoh Exp $ */
/*
* Copyright 2000, 2001, 2004
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.53 2019/01/23 07:40:05 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.54 2019/02/05 06:17:01 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -2314,8 +2314,7 @@ sbmac_attach(device_t parent, device_t s
ifp->if_softc = sc;
memcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ);
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST |
- IFF_NOTRAILERS;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = sbmac_ioctl;
ifp->if_start = sbmac_start;
ifp->if_watchdog = sbmac_watchdog;
Index: src/sys/arch/newsmips/apbus/if_sn.c
diff -u src/sys/arch/newsmips/apbus/if_sn.c:1.43 src/sys/arch/newsmips/apbus/if_sn.c:1.44
--- src/sys/arch/newsmips/apbus/if_sn.c:1.43 Sun Oct 14 00:10:11 2018
+++ src/sys/arch/newsmips/apbus/if_sn.c Tue Feb 5 06:17:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sn.c,v 1.43 2018/10/14 00:10:11 tsutsui Exp $ */
+/* $NetBSD: if_sn.c,v 1.44 2019/02/05 06:17:01 msaitoh Exp $ */
/*
* National Semiconductor DP8393X SONIC Driver
@@ -16,7 +16,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.43 2018/10/14 00:10:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.44 2019/02/05 06:17:01 msaitoh Exp $");
#include "opt_inet.h"
@@ -210,8 +210,7 @@ snsetup(struct sn_softc *sc, uint8_t *ll
ifp->if_softc = sc;
ifp->if_ioctl = snioctl;
ifp->if_start = snstart;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_watchdog = snwatchdog;
if_attach(ifp);
if_deferred_start_init(ifp, NULL);
Index: src/sys/arch/next68k/dev/mb8795.c
diff -u src/sys/arch/next68k/dev/mb8795.c:1.60 src/sys/arch/next68k/dev/mb8795.c:1.61
--- src/sys/arch/next68k/dev/mb8795.c:1.60 Tue Jun 26 06:47:59 2018
+++ src/sys/arch/next68k/dev/mb8795.c Tue Feb 5 06:17:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mb8795.c,v 1.60 2018/06/26 06:47:59 msaitoh Exp $ */
+/* $NetBSD: mb8795.c,v 1.61 2019/02/05 06:17:01 msaitoh Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.60 2018/06/26 06:47:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.61 2019/02/05 06:17:01 msaitoh Exp $");
#include "opt_inet.h"
@@ -108,8 +108,7 @@ mb8795_config(struct mb8795_softc *sc, i
ifp->if_start = mb8795_start;
ifp->if_ioctl = mb8795_ioctl;
ifp->if_watchdog = mb8795_watchdog;
- ifp->if_flags =
- IFF_BROADCAST | IFF_NOTRAILERS;
+ ifp->if_flags = IFF_BROADCAST;
/* Initialize media goo. */
ifmedia_init(&sc->sc_media, 0, mb8795_mediachange,
Index: src/sys/arch/playstation2/dev/if_smap.c
diff -u src/sys/arch/playstation2/dev/if_smap.c:1.27 src/sys/arch/playstation2/dev/if_smap.c:1.28
--- src/sys/arch/playstation2/dev/if_smap.c:1.27 Tue Jun 26 06:47:59 2018
+++ src/sys/arch/playstation2/dev/if_smap.c Tue Feb 5 06:17:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smap.c,v 1.27 2018/06/26 06:47:59 msaitoh Exp $ */
+/* $NetBSD: if_smap.c,v 1.28 2019/02/05 06:17:01 msaitoh Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 1.27 2018/06/26 06:47:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 1.28 2019/02/05 06:17:01 msaitoh Exp $");
#include "debug_playstation2.h"
@@ -220,8 +220,7 @@ smap_attach(struct device *parent, struc
ifp->if_init = smap_init;
ifp->if_stop = smap_stop;
ifp->if_watchdog= smap_watchdog;
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS |
- IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
/* ifmedia setup. */
Index: src/sys/arch/sgimips/hpc/if_sq.c
diff -u src/sys/arch/sgimips/hpc/if_sq.c:1.49 src/sys/arch/sgimips/hpc/if_sq.c:1.50
--- src/sys/arch/sgimips/hpc/if_sq.c:1.49 Tue Jun 26 06:47:59 2018
+++ src/sys/arch/sgimips/hpc/if_sq.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sq.c,v 1.49 2018/06/26 06:47:59 msaitoh Exp $ */
+/* $NetBSD: if_sq.c,v 1.50 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Copyright (c) 2001 Rafal K. Boni
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.49 2018/06/26 06:47:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.50 2019/02/05 06:17:02 msaitoh Exp $");
#include <sys/param.h>
@@ -320,7 +320,7 @@ sq_attach(device_t parent, device_t self
ifp->if_start = sq_start;
ifp->if_ioctl = sq_ioctl;
ifp->if_watchdog = sq_watchdog;
- ifp->if_flags = IFF_BROADCAST | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
if_attach(ifp);
Index: src/sys/arch/sun2/dev/if_ec.c
diff -u src/sys/arch/sun2/dev/if_ec.c:1.30 src/sys/arch/sun2/dev/if_ec.c:1.31
--- src/sys/arch/sun2/dev/if_ec.c:1.30 Mon Sep 3 16:29:28 2018
+++ src/sys/arch/sun2/dev/if_ec.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ec.c,v 1.30 2018/09/03 16:29:28 riastradh Exp $ */
+/* $NetBSD: if_ec.c,v 1.31 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.30 2018/09/03 16:29:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.31 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -219,7 +219,7 @@ ec_attach(device_t parent, device_t self
ifp->if_ioctl = ec_ioctl;
ifp->if_init = ec_init;
ifp->if_watchdog = ec_watchdog;
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
IFQ_SET_READY(&ifp->if_snd);
/* Initialize ifmedia structures. */
Index: src/sys/arch/sun3/dev/if_ie.c
diff -u src/sys/arch/sun3/dev/if_ie.c:1.66 src/sys/arch/sun3/dev/if_ie.c:1.67
--- src/sys/arch/sun3/dev/if_ie.c:1.66 Mon Sep 3 16:29:28 2018
+++ src/sys/arch/sun3/dev/if_ie.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.66 2018/09/03 16:29:28 riastradh Exp $ */
+/* $NetBSD: if_ie.c,v 1.67 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum.
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.66 2018/09/03 16:29:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.67 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -343,8 +343,7 @@ ie_attach(struct ie_softc *sc)
ifp->if_start = iestart;
ifp->if_ioctl = ieioctl;
ifp->if_watchdog = iewatchdog;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
/* Attach the interface. */
if_attach(ifp);
Index: src/sys/arch/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.83 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.84
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.83 Sat Feb 2 12:32:55 2019
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.83 2019/02/02 12:32:55 cherry Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.84 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -84,7 +84,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.83 2019/02/02 12:32:55 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.84 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
@@ -370,7 +370,7 @@ xennet_xenbus_attach(device_t parent, de
ifp->if_watchdog = xennet_watchdog;
ifp->if_init = xennet_init;
ifp->if_stop = xennet_stop;
- ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_timer = 0;
ifp->if_snd.ifq_maxlen = uimax(ifqmaxlen, NET_TX_RING_SIZE * 2);
ifp->if_capabilities = IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_UDPv4_Tx;
Index: src/sys/arch/xen/xen/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.73 src/sys/arch/xen/xen/xennetback_xenbus.c:1.74
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.73 Mon Dec 24 14:55:42 2018
+++ src/sys/arch/xen/xen/xennetback_xenbus.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xennetback_xenbus.c,v 1.73 2018/12/24 14:55:42 cherry Exp $ */
+/* $NetBSD: xennetback_xenbus.c,v 1.74 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.73 2018/12/24 14:55:42 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.74 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_xen.h"
@@ -298,8 +298,7 @@ xennetback_xenbus_create(struct xenbus_d
aprint_verbose_ifnet(ifp, "Ethernet address %s\n",
ether_sprintf(xneti->xni_enaddr));
xneti->xni_ec.ec_capabilities |= ETHERCAP_VLAN_MTU;
- ifp->if_flags =
- IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_snd.ifq_maxlen =
uimax(ifqmaxlen, NET_TX_RING_SIZE * 2);
ifp->if_capabilities = IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_UDPv4_Tx;
Index: src/sys/dev/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.15 src/sys/dev/cadence/if_cemac.c:1.16
--- src/sys/dev/cadence/if_cemac.c:1.15 Tue Jan 22 03:42:26 2019
+++ src/sys/dev/cadence/if_cemac.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cemac.c,v 1.15 2019/01/22 03:42:26 msaitoh Exp $ */
+/* $NetBSD: if_cemac.c,v 1.16 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.15 2019/01/22 03:42:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.16 2019/02/05 06:17:02 msaitoh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -605,7 +605,7 @@ cemac_init(struct cemac_softc *sc)
sc->sc_ethercom.ec_capabilities |= ETHERCAP_VLAN_MTU;
strcpy(ifp->if_xname, device_xname(sc->sc_dev));
- ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = cemac_ifioctl;
ifp->if_start = cemac_ifstart;
ifp->if_watchdog = cemac_ifwatchdog;
Index: src/sys/dev/ic/an.c
diff -u src/sys/dev/ic/an.c:1.69 src/sys/dev/ic/an.c:1.70
--- src/sys/dev/ic/an.c:1.69 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/ic/an.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: an.c,v 1.69 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: an.c,v 1.70 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wp...@ctr.columbia.edu>. All rights reserved.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.69 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.70 2019/02/05 06:17:02 msaitoh Exp $");
#include <sys/param.h>
@@ -258,7 +258,7 @@ an_attach(struct an_softc *sc)
memcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ);
ifp->if_softc = sc;
- ifp->if_flags = IFF_BROADCAST | IFF_NOTRAILERS | IFF_SIMPLEX |
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX |
IFF_MULTICAST | IFF_ALLMULTI;
ifp->if_ioctl = an_ioctl;
ifp->if_start = an_start;
Index: src/sys/dev/ic/atw.c
diff -u src/sys/dev/ic/atw.c:1.164 src/sys/dev/ic/atw.c:1.165
--- src/sys/dev/ic/atw.c:1.164 Tue Jun 26 06:48:00 2018
+++ src/sys/dev/ic/atw.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: atw.c,v 1.164 2018/06/26 06:48:00 msaitoh Exp $ */
+/* $NetBSD: atw.c,v 1.165 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.164 2018/06/26 06:48:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.165 2019/02/05 06:17:02 msaitoh Exp $");
#include <sys/param.h>
@@ -766,8 +766,7 @@ atw_attach(struct atw_softc *sc)
memcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ);
ifp->if_softc = sc;
- ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST |
- IFF_NOTRAILERS;
+ ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
ifp->if_ioctl = atw_ioctl;
ifp->if_start = atw_start;
ifp->if_watchdog = atw_watchdog;
Index: src/sys/dev/ic/awi.c
diff -u src/sys/dev/ic/awi.c:1.94 src/sys/dev/ic/awi.c:1.95
--- src/sys/dev/ic/awi.c:1.94 Tue Jun 26 06:48:00 2018
+++ src/sys/dev/ic/awi.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: awi.c,v 1.94 2018/06/26 06:48:00 msaitoh Exp $ */
+/* $NetBSD: awi.c,v 1.95 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.94 2018/06/26 06:48:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.95 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
@@ -217,11 +217,7 @@ awi_attach(struct awi_softc *sc)
return error;
}
ifp->if_softc = sc;
- ifp->if_flags =
-#ifdef IFF_NOTRAILERS
- IFF_NOTRAILERS |
-#endif
- IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
+ ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
ifp->if_ioctl = awi_ioctl;
ifp->if_start = awi_start;
ifp->if_watchdog = awi_watchdog;
Index: src/sys/dev/ic/cs89x0.c
diff -u src/sys/dev/ic/cs89x0.c:1.41 src/sys/dev/ic/cs89x0.c:1.42
--- src/sys/dev/ic/cs89x0.c:1.41 Tue Jun 26 06:48:00 2018
+++ src/sys/dev/ic/cs89x0.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cs89x0.c,v 1.41 2018/06/26 06:48:00 msaitoh Exp $ */
+/* $NetBSD: cs89x0.c,v 1.42 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Copyright (c) 2004 Christopher Gilbert
@@ -212,7 +212,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.41 2018/06/26 06:48:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.42 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
@@ -399,8 +399,7 @@ cs_attach(struct cs_softc *sc, u_int8_t
ifp->if_ioctl = cs_ioctl;
ifp->if_stop = cs_stop;
ifp->if_watchdog = NULL; /* no watchdog at this stage */
- ifp->if_flags = IFF_SIMPLEX | IFF_NOTRAILERS |
- IFF_BROADCAST | IFF_MULTICAST;
+ ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
/* Initialize ifmedia structures. */
Index: src/sys/dev/ic/dm9000.c
diff -u src/sys/dev/ic/dm9000.c:1.15 src/sys/dev/ic/dm9000.c:1.16
--- src/sys/dev/ic/dm9000.c:1.15 Tue Jun 26 06:48:00 2018
+++ src/sys/dev/ic/dm9000.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm9000.c,v 1.15 2018/06/26 06:48:00 msaitoh Exp $ */
+/* $NetBSD: dm9000.c,v 1.16 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Copyright (c) 2009 Paul Fleischer
@@ -435,8 +435,7 @@ dme_attach(struct dme_softc *sc, const u
ifp->if_ioctl = dme_ioctl;
ifp->if_stop = dme_stop;
ifp->if_watchdog = NULL; /* no watchdog at this stage */
- ifp->if_flags = IFF_SIMPLEX | IFF_NOTRAILERS | IFF_BROADCAST |
- IFF_MULTICAST;
+ ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
/* Initialize ifmedia structures. */
Index: src/sys/dev/ic/dp8390.c
diff -u src/sys/dev/ic/dp8390.c:1.91 src/sys/dev/ic/dp8390.c:1.92
--- src/sys/dev/ic/dp8390.c:1.91 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/ic/dp8390.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390.c,v 1.91 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: dp8390.c,v 1.92 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.91 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.92 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
@@ -126,8 +126,7 @@ dp8390_config(struct dp8390_softc *sc)
ifp->if_ioctl = dp8390_ioctl;
if (ifp->if_watchdog == NULL)
ifp->if_watchdog = dp8390_watchdog;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
/* Print additional info when attached. */
Index: src/sys/dev/ic/elink3.c
diff -u src/sys/dev/ic/elink3.c:1.145 src/sys/dev/ic/elink3.c:1.146
--- src/sys/dev/ic/elink3.c:1.145 Sun Feb 3 03:19:27 2019
+++ src/sys/dev/ic/elink3.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3.c,v 1.145 2019/02/03 03:19:27 mrg Exp $ */
+/* $NetBSD: elink3.c,v 1.146 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.145 2019/02/03 03:19:27 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.146 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
@@ -396,8 +396,7 @@ epconfig(struct ep_softc *sc, u_short ch
ifp->if_watchdog = epwatchdog;
ifp->if_init = epinit;
ifp->if_stop = epstop;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
if_attach(ifp);
Index: src/sys/dev/ic/elinkxl.c
diff -u src/sys/dev/ic/elinkxl.c:1.126 src/sys/dev/ic/elinkxl.c:1.127
--- src/sys/dev/ic/elinkxl.c:1.126 Tue Jan 22 03:42:26 2019
+++ src/sys/dev/ic/elinkxl.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxl.c,v 1.126 2019/01/22 03:42:26 msaitoh Exp $ */
+/* $NetBSD: elinkxl.c,v 1.127 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.126 2019/01/22 03:42:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.127 2019/02/05 06:17:02 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -404,8 +404,7 @@ ex_config(struct ex_softc *sc)
ifp->if_watchdog = ex_watchdog;
ifp->if_init = ex_init;
ifp->if_stop = ex_stop;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
sc->sc_if_flags = ifp->if_flags;
IFQ_SET_READY(&ifp->if_snd);
Index: src/sys/dev/ic/gem.c
diff -u src/sys/dev/ic/gem.c:1.113 src/sys/dev/ic/gem.c:1.114
--- src/sys/dev/ic/gem.c:1.113 Tue Jan 22 03:42:26 2019
+++ src/sys/dev/ic/gem.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gem.c,v 1.113 2019/01/22 03:42:26 msaitoh Exp $ */
+/* $NetBSD: gem.c,v 1.114 2019/02/05 06:17:02 msaitoh Exp $ */
/*
*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.113 2019/01/22 03:42:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.114 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
@@ -534,8 +534,7 @@ gem_attach(struct gem_softc *sc, const u
/* Initialize ifnet structure. */
strlcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ);
ifp->if_softc = sc;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
sc->sc_if_flags = ifp->if_flags;
#if 0
/*
Index: src/sys/dev/ic/hme.c
diff -u src/sys/dev/ic/hme.c:1.101 src/sys/dev/ic/hme.c:1.102
--- src/sys/dev/ic/hme.c:1.101 Tue Jan 22 03:42:26 2019
+++ src/sys/dev/ic/hme.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hme.c,v 1.101 2019/01/22 03:42:26 msaitoh Exp $ */
+/* $NetBSD: hme.c,v 1.102 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.101 2019/01/22 03:42:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.102 2019/02/05 06:17:02 msaitoh Exp $");
/* #define HMEDEBUG */
@@ -232,8 +232,7 @@ hme_config(struct hme_softc *sc)
ifp->if_ioctl = hme_ioctl;
ifp->if_init = hme_init;
ifp->if_watchdog = hme_watchdog;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
sc->sc_if_flags = ifp->if_flags;
ifp->if_capabilities |=
IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_TCPv4_Rx |
Index: src/sys/dev/ic/i82586.c
diff -u src/sys/dev/ic/i82586.c:1.79 src/sys/dev/ic/i82586.c:1.80
--- src/sys/dev/ic/i82586.c:1.79 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/ic/i82586.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: i82586.c,v 1.79 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: i82586.c,v 1.80 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -137,7 +137,7 @@ Mode of operation:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.79 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.80 2019/02/05 06:17:02 msaitoh Exp $");
#include <sys/param.h>
@@ -242,8 +242,7 @@ i82586_attach(struct ie_softc *sc, const
ifp->if_init = i82586_init;
ifp->if_stop = i82586_stop;
ifp->if_watchdog = i82586_watchdog;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
/* Initialize media goo. */
Index: src/sys/dev/ic/lance.c
diff -u src/sys/dev/ic/lance.c:1.54 src/sys/dev/ic/lance.c:1.55
--- src/sys/dev/ic/lance.c:1.54 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/ic/lance.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lance.c,v 1.54 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: lance.c,v 1.55 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.54 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.55 2019/02/05 06:17:02 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -175,8 +175,7 @@ lance_config(struct lance_softc *sc)
ifp->if_watchdog = lance_watchdog;
ifp->if_init = lance_init;
ifp->if_stop = lance_stop;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
#ifdef LANCE_REVC_BUG
ifp->if_flags &= ~IFF_MULTICAST;
#endif
Index: src/sys/dev/ic/lemac.c
diff -u src/sys/dev/ic/lemac.c:1.49 src/sys/dev/ic/lemac.c:1.50
--- src/sys/dev/ic/lemac.c:1.49 Tue Jun 26 06:48:00 2018
+++ src/sys/dev/ic/lemac.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lemac.c,v 1.49 2018/06/26 06:48:00 msaitoh Exp $ */
+/* $NetBSD: lemac.c,v 1.50 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 1994, 1995, 1997 Matt Thomas <m...@3am-software.com>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.49 2018/06/26 06:48:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.50 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
@@ -985,11 +985,7 @@ lemac_ifattach(
ifp->if_start = lemac_ifstart;
ifp->if_ioctl = lemac_ifioctl;
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX
-#ifdef IFF_NOTRAILERS
- | IFF_NOTRAILERS
-#endif
- | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
if (sc->sc_flags & LEMAC_ALIVE) {
int media;
Index: src/sys/dev/ic/mb86950.c
diff -u src/sys/dev/ic/mb86950.c:1.28 src/sys/dev/ic/mb86950.c:1.29
--- src/sys/dev/ic/mb86950.c:1.28 Tue Jun 26 06:48:00 2018
+++ src/sys/dev/ic/mb86950.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86950.c,v 1.28 2018/06/26 06:48:00 msaitoh Exp $ */
+/* $NetBSD: mb86950.c,v 1.29 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.28 2018/06/26 06:48:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.29 2019/02/05 06:17:02 msaitoh Exp $");
/*
* Device driver for Fujitsu mb86950 based Ethernet cards.
@@ -270,7 +270,7 @@ mb86950_config(struct mb86950_softc *sc,
ifp->if_start = mb86950_start;
ifp->if_ioctl = mb86950_ioctl;
ifp->if_watchdog = mb86950_watchdog;
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
IFQ_SET_READY(&ifp->if_snd);
Index: src/sys/dev/ic/mb86960.c
diff -u src/sys/dev/ic/mb86960.c:1.88 src/sys/dev/ic/mb86960.c:1.89
--- src/sys/dev/ic/mb86960.c:1.88 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/ic/mb86960.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86960.c,v 1.88 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: mb86960.c,v 1.89 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.88 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.89 2019/02/05 06:17:02 msaitoh Exp $");
/*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
@@ -188,8 +188,7 @@ mb86960_config(struct mb86960_softc *sc,
ifp->if_start = mb86960_start;
ifp->if_ioctl = mb86960_ioctl;
ifp->if_watchdog = mb86960_watchdog;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
#if FE_DEBUG >= 3
Index: src/sys/dev/ic/rrunner.c
diff -u src/sys/dev/ic/rrunner.c:1.88 src/sys/dev/ic/rrunner.c:1.89
--- src/sys/dev/ic/rrunner.c:1.88 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/ic/rrunner.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rrunner.c,v 1.88 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: rrunner.c,v 1.89 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.88 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.89 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
@@ -405,7 +405,7 @@ eshconfig(struct esh_softc *sc)
ifp->if_start = eshstart;
ifp->if_ioctl = eshioctl;
ifp->if_watchdog = eshwatchdog;
- ifp->if_flags = IFF_SIMPLEX | IFF_NOTRAILERS | IFF_NOARP;
+ ifp->if_flags = IFF_SIMPLEX | IFF_NOARP;
IFQ_SET_READY(&ifp->if_snd);
if_attach(ifp);
Index: src/sys/dev/ic/pdq_ifsubr.c
diff -u src/sys/dev/ic/pdq_ifsubr.c:1.61 src/sys/dev/ic/pdq_ifsubr.c:1.62
--- src/sys/dev/ic/pdq_ifsubr.c:1.61 Sun Feb 3 03:19:27 2019
+++ src/sys/dev/ic/pdq_ifsubr.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pdq_ifsubr.c,v 1.61 2019/02/03 03:19:27 mrg Exp $ */
+/* $NetBSD: pdq_ifsubr.c,v 1.62 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <m...@3am-software.com>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.61 2019/02/03 03:19:27 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.62 2019/02/05 06:17:02 msaitoh Exp $");
#ifdef __NetBSD__
#include "opt_inet.h"
@@ -470,9 +470,6 @@ pdq_ifioctl(
return error;
}
-#ifndef IFF_NOTRAILERS
-#define IFF_NOTRAILERS 0
-#endif
void
pdq_ifattach(
@@ -481,7 +478,7 @@ pdq_ifattach(
{
struct ifnet *ifp = &sc->sc_if;
- ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
#if (defined(__FreeBSD__) && BSD >= 199506) || defined(__NetBSD__)
ifp->if_watchdog = pdq_ifwatchdog;
Index: src/sys/dev/ic/rtw.c
diff -u src/sys/dev/ic/rtw.c:1.129 src/sys/dev/ic/rtw.c:1.130
--- src/sys/dev/ic/rtw.c:1.129 Sun Feb 3 03:19:27 2019
+++ src/sys/dev/ic/rtw.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtw.c,v 1.129 2019/02/03 03:19:27 mrg Exp $ */
+/* $NetBSD: rtw.c,v 1.130 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 David Young. All rights
* reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.129 2019/02/03 03:19:27 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.130 2019/02/05 06:17:02 msaitoh Exp $");
#include <sys/param.h>
@@ -3817,8 +3817,7 @@ rtw_setifprops(struct ifnet *ifp, const
{
(void)strlcpy(ifp->if_xname, dvname, IFNAMSIZ);
ifp->if_softc = softc;
- ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST |
- IFF_NOTRAILERS;
+ ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
ifp->if_ioctl = rtw_ioctl;
ifp->if_start = rtw_start;
ifp->if_watchdog = rtw_watchdog;
Index: src/sys/dev/ic/seeq8005.c
diff -u src/sys/dev/ic/seeq8005.c:1.60 src/sys/dev/ic/seeq8005.c:1.61
--- src/sys/dev/ic/seeq8005.c:1.60 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/ic/seeq8005.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: seeq8005.c,v 1.60 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: seeq8005.c,v 1.61 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.60 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.61 2019/02/05 06:17:02 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -261,7 +261,7 @@ seeq8005_attach(struct seeq8005_softc *s
ifp->if_init = ea_init;
ifp->if_stop = ea_stop;
ifp->if_watchdog = ea_watchdog;
- ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST | IFF_NOTRAILERS;
+ ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST;
if (sc->sc_variant == SEEQ_8004)
ifp->if_flags |= IFF_SIMPLEX;
IFQ_SET_READY(&ifp->if_snd);
Index: src/sys/dev/ic/smc90cx6.c
diff -u src/sys/dev/ic/smc90cx6.c:1.73 src/sys/dev/ic/smc90cx6.c:1.74
--- src/sys/dev/ic/smc90cx6.c:1.73 Tue Jun 26 06:48:00 2018
+++ src/sys/dev/ic/smc90cx6.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: smc90cx6.c,v 1.73 2018/06/26 06:48:00 msaitoh Exp $ */
+/* $NetBSD: smc90cx6.c,v 1.74 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.73 2018/06/26 06:48:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.74 2019/02/05 06:17:02 msaitoh Exp $");
/* #define BAHSOFTCOPY */
#define BAHRETRANSMIT /**/
@@ -191,7 +191,7 @@ bah_attach_subr(struct bah_softc *sc)
ifp->if_watchdog = bah_watchdog;
IFQ_SET_READY(&ifp->if_snd);
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
ifp->if_mtu = ARCMTU;
Index: src/sys/dev/ic/smc91cxx.c
diff -u src/sys/dev/ic/smc91cxx.c:1.98 src/sys/dev/ic/smc91cxx.c:1.99
--- src/sys/dev/ic/smc91cxx.c:1.98 Tue Jan 22 03:42:26 2019
+++ src/sys/dev/ic/smc91cxx.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: smc91cxx.c,v 1.98 2019/01/22 03:42:26 msaitoh Exp $ */
+/* $NetBSD: smc91cxx.c,v 1.99 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.98 2019/01/22 03:42:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.99 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
@@ -300,8 +300,7 @@ smc91cxx_attach(struct smc91cxx_softc *s
ifp->if_start = smc91cxx_start;
ifp->if_ioctl = smc91cxx_ioctl;
ifp->if_watchdog = smc91cxx_watchdog;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
/* Attach the interface. */
Index: src/sys/dev/ic/tropic.c
diff -u src/sys/dev/ic/tropic.c:1.51 src/sys/dev/ic/tropic.c:1.52
--- src/sys/dev/ic/tropic.c:1.51 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/ic/tropic.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tropic.c,v 1.51 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: tropic.c,v 1.52 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Ported to NetBSD by Onno van der Linden
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.51 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.52 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
@@ -329,7 +329,7 @@ tr_attach(struct tr_softc *sc)
ifp->if_start = tr_start;
else
ifp->if_start = tr_oldstart;
- ifp->if_flags = IFF_BROADCAST | IFF_NOTRAILERS;
+ ifp->if_flags = IFF_BROADCAST;
ifp->if_watchdog = tr_watchdog;
IFQ_SET_READY(&ifp->if_snd);
Index: src/sys/dev/ic/wi.c
diff -u src/sys/dev/ic/wi.c:1.249 src/sys/dev/ic/wi.c:1.250
--- src/sys/dev/ic/wi.c:1.249 Thu Nov 15 10:56:29 2018
+++ src/sys/dev/ic/wi.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wi.c,v 1.249 2018/11/15 10:56:29 maxv Exp $ */
+/* $NetBSD: wi.c,v 1.250 2019/02/05 06:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.249 2018/11/15 10:56:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.250 2019/02/05 06:17:02 msaitoh Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@@ -417,8 +417,7 @@ wi_attach(struct wi_softc *sc, const u_i
ifp->if_watchdog = wi_watchdog;
ifp->if_init = wi_init;
ifp->if_stop = wi_stop;
- ifp->if_flags =
- IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST | IFF_NOTRAILERS;
+ ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
ic->ic_ifp = ifp;
Index: src/sys/dev/isa/if_eg.c
diff -u src/sys/dev/isa/if_eg.c:1.95 src/sys/dev/isa/if_eg.c:1.96
--- src/sys/dev/isa/if_eg.c:1.95 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/isa/if_eg.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eg.c,v 1.95 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: if_eg.c,v 1.96 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Copyright (c) 1993 Dean Huxley <d...@fsa.ca>
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.95 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.96 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
@@ -452,7 +452,7 @@ egattach(device_t parent, device_t self,
ifp->if_start = egstart;
ifp->if_ioctl = egioctl;
ifp->if_watchdog = egwatchdog;
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
IFQ_SET_READY(&ifp->if_snd);
/* Now we can attach the interface. */
Index: src/sys/dev/isa/if_el.c
diff -u src/sys/dev/isa/if_el.c:1.97 src/sys/dev/isa/if_el.c:1.98
--- src/sys/dev/isa/if_el.c:1.97 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/isa/if_el.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_el.c,v 1.97 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: if_el.c,v 1.98 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.97 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.98 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
@@ -236,7 +236,7 @@ elattach(device_t parent, device_t self,
ifp->if_start = elstart;
ifp->if_ioctl = elioctl;
ifp->if_watchdog = elwatchdog;
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
IFQ_SET_READY(&ifp->if_snd);
/* Now we can attach the interface. */
Index: src/sys/dev/isa/if_iy.c
diff -u src/sys/dev/isa/if_iy.c:1.103 src/sys/dev/isa/if_iy.c:1.104
--- src/sys/dev/isa/if_iy.c:1.103 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/isa/if_iy.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iy.c,v 1.103 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: if_iy.c,v 1.104 2019/02/05 06:17:02 msaitoh Exp $ */
/* #define IYDEBUG */
/* #define IYMEMDEBUG */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.103 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.104 2019/02/05 06:17:02 msaitoh Exp $");
#include "opt_inet.h"
@@ -308,8 +308,7 @@ iyattach(device_t parent, device_t self,
strlcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ);
ifp->if_softc = sc;
ifp->if_start = iystart;
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS
- | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
sc->doing_mc_setup = 0;
Index: src/sys/dev/ofw/ofnet.c
diff -u src/sys/dev/ofw/ofnet.c:1.61 src/sys/dev/ofw/ofnet.c:1.62
--- src/sys/dev/ofw/ofnet.c:1.61 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/ofw/ofnet.c Tue Feb 5 06:17:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ofnet.c,v 1.61 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: ofnet.c,v 1.62 2019/02/05 06:17:02 msaitoh Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.61 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.62 2019/02/05 06:17:02 msaitoh Exp $");
#include "ofnet.h"
#include "opt_inet.h"
@@ -132,7 +132,7 @@ ofnet_attach(device_t parent, device_t s
ifp->if_start = ofnet_start;
ifp->if_ioctl = ofnet_ioctl;
ifp->if_watchdog = ofnet_watchdog;
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
IFQ_SET_READY(&ifp->if_snd);
if_attach(ifp);
Index: src/sys/dev/pci/if_cas.c
diff -u src/sys/dev/pci/if_cas.c:1.30 src/sys/dev/pci/if_cas.c:1.31
--- src/sys/dev/pci/if_cas.c:1.30 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/pci/if_cas.c Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cas.c,v 1.30 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_cas.c,v 1.31 2019/02/05 06:17:03 msaitoh Exp $ */
/* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */
/*
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.30 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.31 2019/02/05 06:17:03 msaitoh Exp $");
#ifndef _MODULE
#include "opt_inet.h"
@@ -514,8 +514,7 @@ cas_config(struct cas_softc *sc, const u
/* Initialize ifnet structure. */
strlcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ);
ifp->if_softc = sc;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_start = cas_start;
ifp->if_ioctl = cas_ioctl;
ifp->if_watchdog = cas_watchdog;
Index: src/sys/dev/pci/if_de.c
diff -u src/sys/dev/pci/if_de.c:1.157 src/sys/dev/pci/if_de.c:1.158
--- src/sys/dev/pci/if_de.c:1.157 Tue Jan 8 06:17:40 2019
+++ src/sys/dev/pci/if_de.c Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.157 2019/01/08 06:17:40 msaitoh Exp $ */
+/* $NetBSD: if_de.c,v 1.158 2019/02/05 06:17:03 msaitoh Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (m...@3am-software.com)
@@ -37,7 +37,7 @@
* board which support 21040, 21041, or 21140 (mostly).
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.157 2019/01/08 06:17:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.158 2019/02/05 06:17:03 msaitoh Exp $");
#define TULIP_HDR_DATA
@@ -5007,16 +5007,13 @@ tulip_ifwatchdog_wrapper(int unit)
#ifdef printf
#undef printf
#endif
-#if !defined(IFF_NOTRAILERS)
-#define IFF_NOTRAILERS 0
-#endif
static void
tulip_attach(tulip_softc_t * const sc)
{
struct ifnet * const ifp = &sc->tulip_if;
- ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = tulip_ifioctl;
ifp->if_start = tulip_ifstart;
ifp->if_watchdog = tulip_ifwatchdog;
Index: src/sys/dev/pci/if_devar.h
diff -u src/sys/dev/pci/if_devar.h:1.61 src/sys/dev/pci/if_devar.h:1.62
--- src/sys/dev/pci/if_devar.h:1.61 Tue Jan 8 06:17:40 2019
+++ src/sys/dev/pci/if_devar.h Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_devar.h,v 1.61 2019/01/08 06:17:40 msaitoh Exp $ */
+/* $NetBSD: if_devar.h,v 1.62 2019/02/05 06:17:03 msaitoh Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (m...@3am-software.com)
@@ -942,7 +942,6 @@ static tulip_softc_t *tulips[TULIP_MAX_D
#define TULIP_IFP_TO_SOFTC(ifp) ((tulip_softc_t *)((ifp)->if_softc))
#define tulip_intrfunc_t void
#define TULIP_VOID_INTRFUNC
-#define IFF_NOTRAILERS 0
#define CLBYTES PAGE_SIZE
#if 0
#define TULIP_KVATOPHYS(sc, va) kvtop(va)
Index: src/sys/dev/pci/if_jme.c
diff -u src/sys/dev/pci/if_jme.c:1.37 src/sys/dev/pci/if_jme.c:1.38
--- src/sys/dev/pci/if_jme.c:1.37 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/pci/if_jme.c Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_jme.c,v 1.37 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_jme.c,v 1.38 2019/02/05 06:17:03 msaitoh Exp $ */
/*
* Copyright (c) 2008 Manuel Bouyer. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.37 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.38 2019/02/05 06:17:03 msaitoh Exp $");
#include <sys/param.h>
@@ -481,7 +481,7 @@ jme_pci_attach(device_t parent, device_t
strlcpy(ifp->if_xname, device_xname(self), IFNAMSIZ);
- ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = jme_ifioctl;
ifp->if_start = jme_ifstart;
ifp->if_watchdog = jme_ifwatchdog;
Index: src/sys/dev/pci/if_tl.c
diff -u src/sys/dev/pci/if_tl.c:1.111 src/sys/dev/pci/if_tl.c:1.112
--- src/sys/dev/pci/if_tl.c:1.111 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/pci/if_tl.c Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.111 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_tl.c,v 1.112 2019/02/05 06:17:03 msaitoh Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.111 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.112 2019/02/05 06:17:03 msaitoh Exp $");
#undef TLDEBUG
#define TL_PRIV_STATS
@@ -448,7 +448,7 @@ tl_pci_attach(device_t parent, device_t
sc->tl_ec.ec_capabilities |= ETHERCAP_VLAN_MTU;
strlcpy(ifp->if_xname, device_xname(self), IFNAMSIZ);
- ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = tl_ifioctl;
ifp->if_start = tl_ifstart;
ifp->if_watchdog = tl_ifwatchdog;
Index: src/sys/dev/pci/if_vte.c
diff -u src/sys/dev/pci/if_vte.c:1.22 src/sys/dev/pci/if_vte.c:1.23
--- src/sys/dev/pci/if_vte.c:1.22 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/pci/if_vte.c Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vte.c,v 1.22 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_vte.c,v 1.23 2019/02/05 06:17:03 msaitoh Exp $ */
/*
* Copyright (c) 2011 Manuel Bouyer. All rights reserved.
@@ -55,7 +55,7 @@
/* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.22 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.23 2019/02/05 06:17:03 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -258,7 +258,7 @@ vte_attach(device_t parent, device_t sel
sc->vte_ec.ec_capabilities |= ETHERCAP_VLAN_MTU;
strlcpy(ifp->if_xname, device_xname(self), IFNAMSIZ);
- ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = vte_ifioctl;
ifp->if_start = vte_ifstart;
ifp->if_watchdog = vte_ifwatchdog;
Index: src/sys/dev/pcmcia/if_cnw.c
diff -u src/sys/dev/pcmcia/if_cnw.c:1.64 src/sys/dev/pcmcia/if_cnw.c:1.65
--- src/sys/dev/pcmcia/if_cnw.c:1.64 Mon Sep 3 16:29:33 2018
+++ src/sys/dev/pcmcia/if_cnw.c Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnw.c,v 1.64 2018/09/03 16:29:33 riastradh Exp $ */
+/* $NetBSD: if_cnw.c,v 1.65 2019/02/05 06:17:03 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.64 2018/09/03 16:29:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.65 2019/02/05 06:17:03 msaitoh Exp $");
#include "opt_inet.h"
@@ -550,8 +550,7 @@ cnw_attach(device_t parent, device_t sel
ifp->if_start = cnw_start;
ifp->if_ioctl = cnw_ioctl;
ifp->if_watchdog = cnw_watchdog;
- ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST | IFF_SIMPLEX |
- IFF_NOTRAILERS;
+ ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST | IFF_SIMPLEX;
IFQ_SET_READY(&ifp->if_snd);
/* Attach the interface */
Index: src/sys/dev/pcmcia/if_xi.c
diff -u src/sys/dev/pcmcia/if_xi.c:1.85 src/sys/dev/pcmcia/if_xi.c:1.86
--- src/sys/dev/pcmcia/if_xi.c:1.85 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/pcmcia/if_xi.c Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xi.c,v 1.85 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_xi.c,v 1.86 2019/02/05 06:17:03 msaitoh Exp $ */
/* OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp */
/*
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.85 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.86 2019/02/05 06:17:03 msaitoh Exp $");
#include "opt_inet.h"
@@ -210,8 +210,7 @@ xi_attach(struct xi_softc *sc, uint8_t *
ifp->if_start = xi_start;
ifp->if_ioctl = xi_ioctl;
ifp->if_watchdog = xi_watchdog;
- ifp->if_flags =
- IFF_BROADCAST | IFF_NOTRAILERS | IFF_SIMPLEX | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
/* 802.1q capability */
Index: src/sys/dev/sbus/be.c
diff -u src/sys/dev/sbus/be.c:1.90 src/sys/dev/sbus/be.c:1.91
--- src/sys/dev/sbus/be.c:1.90 Tue Jan 22 03:42:28 2019
+++ src/sys/dev/sbus/be.c Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: be.c,v 1.90 2019/01/22 03:42:28 msaitoh Exp $ */
+/* $NetBSD: be.c,v 1.91 2019/02/05 06:17:03 msaitoh Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.90 2019/01/22 03:42:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.91 2019/02/05 06:17:03 msaitoh Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -441,8 +441,7 @@ beattach(device_t parent, device_t self,
ifp->if_watchdog = bewatchdog;
ifp->if_init = beinit;
ifp->if_stop = bestop;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
/* claim 802.1q capability */
Index: src/sys/dev/sbus/qe.c
diff -u src/sys/dev/sbus/qe.c:1.70 src/sys/dev/sbus/qe.c:1.71
--- src/sys/dev/sbus/qe.c:1.70 Mon Sep 3 16:29:33 2018
+++ src/sys/dev/sbus/qe.c Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: qe.c,v 1.70 2018/09/03 16:29:33 riastradh Exp $ */
+/* $NetBSD: qe.c,v 1.71 2019/02/05 06:17:03 msaitoh Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.70 2018/09/03 16:29:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.71 2019/02/05 06:17:03 msaitoh Exp $");
#define QEDEBUG
@@ -300,8 +300,7 @@ qeattach(device_t parent, device_t self,
ifp->if_start = qestart;
ifp->if_ioctl = qeioctl;
ifp->if_watchdog = qewatchdog;
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS |
- IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
/* Attach the interface. */
Index: src/sys/dev/scsipi/if_se.c
diff -u src/sys/dev/scsipi/if_se.c:1.98 src/sys/dev/scsipi/if_se.c:1.99
--- src/sys/dev/scsipi/if_se.c:1.98 Mon Sep 3 16:29:33 2018
+++ src/sys/dev/scsipi/if_se.c Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_se.c,v 1.98 2018/09/03 16:29:33 riastradh Exp $ */
+/* $NetBSD: if_se.c,v 1.99 2019/02/05 06:17:03 msaitoh Exp $ */
/*
* Copyright (c) 1997 Ian W. Dall <ian.d...@dsto.defence.gov.au>
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.98 2018/09/03 16:29:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.99 2019/02/05 06:17:03 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -357,8 +357,7 @@ seattach(device_t parent, device_t self,
ifp->if_start = se_ifstart;
ifp->if_ioctl = se_ioctl;
ifp->if_watchdog = sewatchdog;
- ifp->if_flags =
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
IFQ_SET_READY(&ifp->if_snd);
/* Attach the interface. */
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.266 src/sys/net/if.h:1.267
--- src/sys/net/if.h:1.266 Thu Oct 18 11:34:54 2018
+++ src/sys/net/if.h Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.266 2018/10/18 11:34:54 knakahara Exp $ */
+/* $NetBSD: if.h,v 1.267 2019/02/05 06:17:03 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -412,7 +412,7 @@ typedef struct ifnet {
#define IFF_DEBUG 0x0004 /* turn on debugging */
#define IFF_LOOPBACK 0x0008 /* is a loopback net */
#define IFF_POINTOPOINT 0x0010 /* interface is point-to-point link */
-#define IFF_NOTRAILERS 0x0020 /* avoid use of trailers */
+/* 0x0020 was IFF_NOTRAILERS */
#define IFF_RUNNING 0x0040 /* resources allocated */
#define IFF_NOARP 0x0080 /* no address resolution protocol */
#define IFF_PROMISC 0x0100 /* receive all packets */
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.110 src/sys/net/if_fddisubr.c:1.111
--- src/sys/net/if_fddisubr.c:1.110 Sun Feb 3 03:19:28 2019
+++ src/sys/net/if_fddisubr.c Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fddisubr.c,v 1.110 2019/02/03 03:19:28 mrg Exp $ */
+/* $NetBSD: if_fddisubr.c,v 1.111 2019/02/05 06:17:03 msaitoh Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.110 2019/02/03 03:19:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.111 2019/02/05 06:17:03 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -626,9 +626,6 @@ fddi_ifattach(struct ifnet *ifp, void *l
ifp->if_output = fddi_output;
ifp->_if_input = fddi_input;
ifp->if_baudrate = IF_Mbps(100);
-#ifdef IFF_NOTRAILERS
- ifp->if_flags |= IFF_NOTRAILERS;
-#endif
/*
* Update the max_linkhdr
Index: src/sys/net/if_tokensubr.c
diff -u src/sys/net/if_tokensubr.c:1.83 src/sys/net/if_tokensubr.c:1.84
--- src/sys/net/if_tokensubr.c:1.83 Wed May 9 06:35:10 2018
+++ src/sys/net/if_tokensubr.c Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tokensubr.c,v 1.83 2018/05/09 06:35:10 maxv Exp $ */
+/* $NetBSD: if_tokensubr.c,v 1.84 2019/02/05 06:17:03 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -92,7 +92,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.83 2018/05/09 06:35:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.84 2019/02/05 06:17:03 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -512,9 +512,6 @@ token_ifattach(struct ifnet *ifp, void *
ifp->if_output = token_output;
ifp->_if_input = token_input;
ifp->if_broadcastaddr = tokenbroadcastaddr;
-#ifdef IFF_NOTRAILERS
- ifp->if_flags |= IFF_NOTRAILERS;
-#endif
if_set_sadl(ifp, lla, ISO88025_ADDR_LEN, true);
Index: src/usr.sbin/route6d/route6d.c
diff -u src/usr.sbin/route6d/route6d.c:1.72 src/usr.sbin/route6d/route6d.c:1.73
--- src/usr.sbin/route6d/route6d.c:1.72 Thu Jun 14 16:17:18 2018
+++ src/usr.sbin/route6d/route6d.c Tue Feb 5 06:17:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: route6d.c,v 1.72 2018/06/14 16:17:18 christos Exp $ */
+/* $NetBSD: route6d.c,v 1.73 2019/02/05 06:17:03 msaitoh Exp $ */
/* $KAME: route6d.c,v 1.94 2002/10/26 20:08:55 itojun Exp $ */
/*
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: route6d.c,v 1.72 2018/06/14 16:17:18 christos Exp $");
+__RCSID("$NetBSD: route6d.c,v 1.73 2019/02/05 06:17:03 msaitoh Exp $");
#endif
#include <stdbool.h>
@@ -2326,9 +2326,6 @@ do { \
IFFLAG("DEBUG", IFF_DEBUG);
IFFLAG("LOOPBACK", IFF_LOOPBACK);
IFFLAG("POINTOPOINT", IFF_POINTOPOINT);
-#ifdef IFF_NOTRAILERS
- IFFLAG("NOTRAILERS", IFF_NOTRAILERS);
-#endif
#ifdef IFF_SMART
IFFLAG("SMART", IFF_SMART);
#endif
