diff options
author | Brad Smith <brad@cvs.openbsd.org> | 2004-09-23 17:45:18 +0000 |
---|---|---|
committer | Brad Smith <brad@cvs.openbsd.org> | 2004-09-23 17:45:18 +0000 |
commit | 03afde90fdef2d05bb166cbf5f2f07a88a1c045f (patch) | |
tree | eccb33a8d1dec467b0469222f8886ee07fcf55cf | |
parent | 3c9617027361ea16eabd3dca15bc05d40d9508b7 (diff) |
don't need to set ifp->if_mtu or ifp->if_output in each driver,
{ether,atm,fddi}_ifattach already does this.
ok mcbride@ markus@ henning@
33 files changed, 33 insertions, 90 deletions
diff --git a/sys/arch/sgi/dev/if_mec.c b/sys/arch/sgi/dev/if_mec.c index a90135d84ac..890ca731af2 100644 --- a/sys/arch/sgi/dev/if_mec.c +++ b/sys/arch/sgi/dev/if_mec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mec.c,v 1.4 2004/08/26 13:03:59 pefo Exp $ */ +/* $OpenBSD: if_mec.c,v 1.5 2004/09/23 17:45:16 brad Exp $ */ /* $NetBSD: if_mec_mace.c,v 1.5 2004/08/01 06:36:36 tsutsui Exp $ */ /* @@ -479,7 +479,6 @@ mec_attach(struct device *parent, struct device *self, void *aux) ifp->if_ioctl = mec_ioctl; ifp->if_start = mec_start; ifp->if_watchdog = mec_watchdog; - ifp->if_mtu = ETHERMTU; IFQ_SET_READY(&ifp->if_snd); if_attach(ifp); diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c index 1b714b5c4da..35e913216de 100644 --- a/sys/dev/ic/an.c +++ b/sys/dev/ic/an.c @@ -1,4 +1,4 @@ -/* $OpenBSD: an.c,v 1.38 2004/08/05 20:06:58 brad Exp $ */ +/* $OpenBSD: an.c,v 1.39 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -232,7 +232,6 @@ an_attach(sc) bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ); ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = an_ioctl; ifp->if_start = an_start; diff --git a/sys/dev/ic/awi.c b/sys/dev/ic/awi.c index 3e5cc4d093f..48dd80eb1bc 100644 --- a/sys/dev/ic/awi.c +++ b/sys/dev/ic/awi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: awi.c,v 1.13 2004/05/12 06:35:10 tedu Exp $ */ +/* $OpenBSD: awi.c,v 1.14 2004/09/23 17:45:16 brad Exp $ */ /* $NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $ */ /*- @@ -305,7 +305,6 @@ awi_attach(sc) ifp->if_start = awi_start; ifp->if_ioctl = awi_ioctl; ifp->if_watchdog = awi_watchdog; - ifp->if_mtu = ETHERMTU; ifp->if_hdrlen = sizeof(struct ieee80211_frame) + sizeof(struct ether_header); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c index 66ec4d954b8..7b121916011 100644 --- a/sys/dev/ic/dc.c +++ b/sys/dev/ic/dc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dc.c,v 1.67 2004/05/31 03:53:53 mcbride Exp $ */ +/* $OpenBSD: dc.c,v 1.68 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -1692,10 +1692,8 @@ hasmac: ifp = &sc->sc_arpcom.ac_if; ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = dc_ioctl; - ifp->if_output = ether_output; ifp->if_start = dc_start; ifp->if_watchdog = dc_watchdog; ifp->if_baudrate = 10000000; diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c index e2e096f62fe..a3e5ffddd89 100644 --- a/sys/dev/ic/midway.c +++ b/sys/dev/ic/midway.c @@ -1,4 +1,4 @@ -/* $OpenBSD: midway.c,v 1.32 2003/10/21 18:58:49 jmc Exp $ */ +/* $OpenBSD: midway.c,v 1.33 2004/09/23 17:45:16 brad Exp $ */ /* (sync'd to midway.c 1.68) */ /* @@ -748,7 +748,6 @@ done_probe: #endif ifp->if_flags = IFF_SIMPLEX|IFF_NOTRAILERS; ifp->if_ioctl = en_ioctl; - ifp->if_output = atm_output; ifp->if_start = en_start; IFQ_SET_READY(&ifp->if_snd); diff --git a/sys/dev/ic/mtd8xx.c b/sys/dev/ic/mtd8xx.c index a3d5c9cba6e..f711c70f7b9 100644 --- a/sys/dev/ic/mtd8xx.c +++ b/sys/dev/ic/mtd8xx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtd8xx.c,v 1.5 2004/06/05 20:25:15 mcbride Exp $ */ +/* $OpenBSD: mtd8xx.c,v 1.6 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 2003 Oleg Safiullin <form@pdp11.org.ru> @@ -160,10 +160,8 @@ mtd_attach(struct mtd_softc *sc) /* Initialize interface */ ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = mtd_ioctl; - ifp->if_output = ether_output; ifp->if_start = mtd_start; ifp->if_watchdog = mtd_watchdog; ifp->if_baudrate = 10000000; diff --git a/sys/dev/ic/pdq_ifsubr.c b/sys/dev/ic/pdq_ifsubr.c index d2f1dddbdf6..86b7a725a20 100644 --- a/sys/dev/ic/pdq_ifsubr.c +++ b/sys/dev/ic/pdq_ifsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pdq_ifsubr.c,v 1.14 2004/05/12 06:35:10 tedu Exp $ */ +/* $OpenBSD: pdq_ifsubr.c,v 1.15 2004/09/23 17:45:16 brad Exp $ */ /* $NetBSD: pdq_ifsubr.c,v 1.5 1996/05/20 00:26:21 thorpej Exp $ */ /*- @@ -363,7 +363,6 @@ pdq_ifattach( #endif ifp->if_ioctl = pdq_ifioctl; - ifp->if_output = fddi_output; ifp->if_start = pdq_ifstart; IFQ_SET_READY(&ifp->if_snd); diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c index 94705284561..5070775b05c 100644 --- a/sys/dev/ic/rtl81x9.c +++ b/sys/dev/ic/rtl81x9.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl81x9.c,v 1.26 2004/06/06 17:56:36 mcbride Exp $ */ +/* $OpenBSD: rtl81x9.c,v 1.27 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, 1998 @@ -1242,10 +1242,8 @@ rl_attach(sc) sc->rl_cdata.rl_rx_buf += sizeof(u_int64_t); ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = rl_ioctl; - ifp->if_output = ether_output; ifp->if_start = rl_start; ifp->if_watchdog = rl_watchdog; ifp->if_baudrate = 10000000; diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c index 990bc0be8fc..b83d44c8993 100644 --- a/sys/dev/ic/xl.c +++ b/sys/dev/ic/xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xl.c,v 1.54 2004/06/04 21:49:02 brad Exp $ */ +/* $OpenBSD: xl.c,v 1.55 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -2668,10 +2668,8 @@ xl_attach(sc) timeout_set(&sc->xl_stsup_tmo, xl_stats_update, sc); ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = xl_ioctl; - ifp->if_output = ether_output; #if NVLAN > 0 ifp->if_capabilities |= IFCAP_VLAN_MTU; #endif diff --git a/sys/dev/isa/if_ex.c b/sys/dev/isa/if_ex.c index baf08cb2a5a..a1dde5d8d90 100644 --- a/sys/dev/isa/if_ex.c +++ b/sys/dev/isa/if_ex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ex.c,v 1.8 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: if_ex.c,v 1.9 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, Donald A. Schmidt * Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es) @@ -287,11 +287,9 @@ ex_attach(parent, self, aux) */ ifp->if_softc = sc; bcopy(self->dv_xname, ifp->if_xname, IFNAMSIZ); - ifp->if_output = ether_output; ifp->if_start = ex_start; ifp->if_ioctl = ex_ioctl; ifp->if_watchdog = ex_watchdog; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST; /* XXX not done yet. | IFF_MULTICAST */ IFQ_SET_READY(&ifp->if_snd); diff --git a/sys/dev/isa/if_hp.c b/sys/dev/isa/if_hp.c index 5e05b2296a8..3196f3c162d 100644 --- a/sys/dev/isa/if_hp.c +++ b/sys/dev/isa/if_hp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_hp.c,v 1.12 2004/06/13 21:49:24 niklas Exp $ */ +/* $OpenBSD: if_hp.c,v 1.13 2004/09/23 17:45:16 brad Exp $ */ /* $NetBSD: if_hp.c,v 1.21 1995/12/24 02:31:31 mycroft Exp $ */ /* XXX THIS DRIVER IS BROKEN. IT WILL NOT EVEN COMPILE. */ @@ -87,7 +87,7 @@ #include <dev/isa/if_nereg.h> int hpprobe(), hpattach(), hpintr(); -int hpstart(), hpinit(), ether_output(), hpioctl(); +int hpstart(), hpinit(), hpioctl(); struct isa_driver hpdriver = { @@ -394,12 +394,10 @@ hpattach(dvp) ifp->if_unit = unit; ifp->if_name = hpdriver.name; - ifp->if_mtu = ETHERMTU; printf("hp%d: %s %d-bit ethernet address %s\n", unit, hp_id(ns->hp_type), ns->ns_mode & DSDC_WTS ? 32 : 16, ether_sprintf(ns->ns_addrp)); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS; - ifp->if_output = ether_output; ifp->if_start = hpstart; ifp->if_ioctl = hpioctl; ifp->if_reset = hpreset; diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index e5eb65336a1..4f3f6d4ab6d 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.31 2004/09/16 00:55:09 mcbride Exp $ */ +/* $OpenBSD: if_bge.c,v 1.32 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2001 @@ -1683,11 +1683,9 @@ bge_attach(parent, self, aux) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = bge_ioctl; - ifp->if_output = ether_output; ifp->if_start = bge_start; ifp->if_watchdog = bge_watchdog; ifp->if_baudrate = 1000000000; - ifp->if_mtu = ETHERMTU; IFQ_SET_MAXLEN(&ifp->if_snd, BGE_TX_RING_CNT - 1); IFQ_SET_READY(&ifp->if_snd); DPRINTFN(5, ("bcopy\n")); diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index 698137101af..d795d4244e2 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_de.c,v 1.60 2004/05/31 04:21:12 mcbride Exp $ */ +/* $OpenBSD: if_de.c,v 1.61 2004/09/23 17:45:16 brad Exp $ */ /* $NetBSD: if_de.c,v 1.45 1997/06/09 00:34:18 thorpej Exp $ */ /*- @@ -4780,12 +4780,6 @@ tulip_attach( ifp->if_start = tulip_ifstart; ifp->if_watchdog = tulip_ifwatchdog; ifp->if_timer = 1; -#if !defined(__bsdi__) || _BSDI_VERSION < 199401 - ifp->if_output = ether_output; -#endif -#if defined(__bsdi__) && _BSDI_VERSION < 199401 - ifp->if_mtu = ETHERMTU; -#endif #ifdef __OpenBSD__ timeout_set(&sc->tulip_stmo, tulip_timeout_callback, sc); diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 2404bf569ad..1604cde2d31 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /*$FreeBSD: if_em.c,v 1.38 2004/03/17 17:50:31 njl Exp $*/ -/* $OpenBSD: if_em.c,v 1.27 2004/09/16 09:37:14 mcbride Exp $ */ +/* $OpenBSD: if_em.c,v 1.28 2004/09/23 17:45:16 brad Exp $ */ #include "bpfilter.h" #include "vlan.h" @@ -2183,8 +2183,6 @@ em_setup_interface(struct em_softc * sc) strlcpy(ifp->if_xname, sc->sc_dv.dv_xname, IFNAMSIZ); #endif - ifp->if_mtu = ETHERMTU; - ifp->if_output = ether_output; ifp->if_baudrate = 1000000000; #ifdef __FreeBSD__ ifp->if_init = em_init; diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c index a5b0a297174..223a1c6ad13 100644 --- a/sys/dev/pci/if_lge.c +++ b/sys/dev/pci/if_lge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lge.c,v 1.16 2004/08/05 19:57:17 brad Exp $ */ +/* $OpenBSD: if_lge.c,v 1.17 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -617,10 +617,8 @@ void lge_attach(parent, self, aux) ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = lge_ioctl; - ifp->if_output = ether_output; ifp->if_start = lge_start; ifp->if_watchdog = lge_watchdog; ifp->if_baudrate = 1000000000; diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c index 8a4c19afbe8..7f8faf56e02 100644 --- a/sys/dev/pci/if_nge.c +++ b/sys/dev/pci/if_nge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nge.c,v 1.29 2004/08/05 19:57:17 brad Exp $ */ +/* $OpenBSD: if_nge.c,v 1.30 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -913,10 +913,8 @@ nge_attach(parent, self, aux) ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = nge_ioctl; - ifp->if_output = ether_output; ifp->if_start = nge_start; ifp->if_watchdog = nge_watchdog; ifp->if_baudrate = 1000000000; diff --git a/sys/dev/pci/if_re.c b/sys/dev/pci/if_re.c index 82a307d290c..95ab280ade3 100644 --- a/sys/dev/pci/if_re.c +++ b/sys/dev/pci/if_re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_re.c,v 1.8 2004/08/05 21:17:20 brad Exp $ */ +/* $OpenBSD: if_re.c,v 1.9 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, 1998-2003 * Bill Paul <wpaul@windriver.com>. All rights reserved. @@ -982,7 +982,6 @@ re_attach(struct device *parent, struct device *self, void *aux) ifp = &sc->sc_arpcom.ac_if; ifp->if_softc = sc; strlcpy(ifp->if_xname, sc->sc_dev.dv_xname, IFNAMSIZ); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = re_ioctl; #ifdef VLANXXX diff --git a/sys/dev/pci/if_sf.c b/sys/dev/pci/if_sf.c index 797de5e42d6..e22fcfd536b 100644 --- a/sys/dev/pci/if_sf.c +++ b/sys/dev/pci/if_sf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sf.c,v 1.25 2004/06/01 02:43:28 tedu Exp $ */ +/* $OpenBSD: if_sf.c,v 1.26 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -705,10 +705,8 @@ void sf_attach(parent, self, aux) ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = sf_ioctl; - ifp->if_output = ether_output; ifp->if_start = sf_start; ifp->if_watchdog = sf_watchdog; ifp->if_baudrate = 10000000; diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index bc250fcceda..5665d2c53ed 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.40 2004/07/04 22:57:20 deraadt Exp $ */ +/* $OpenBSD: if_sis.c,v 1.41 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -1119,10 +1119,8 @@ void sis_attach(parent, self, aux) ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = sis_ioctl; - ifp->if_output = ether_output; ifp->if_start = sis_start; ifp->if_watchdog = sis_watchdog; ifp->if_baudrate = 10000000; diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index 2b693d72b86..560e3f4d4f0 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.45 2004/08/20 06:17:05 deraadt Exp $ */ +/* $OpenBSD: if_sk.c,v 1.46 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1272,10 +1272,8 @@ sk_attach(struct device *parent, struct device *self, void *aux) ifp = &sc_if->arpcom.ac_if; ifp->if_softc = sc_if; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = sk_ioctl; - ifp->if_output = ether_output; ifp->if_start = sk_start; ifp->if_watchdog = sk_watchdog; ifp->if_baudrate = 1000000000; diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c index 7362180a54b..b013a358708 100644 --- a/sys/dev/pci/if_ste.c +++ b/sys/dev/pci/if_ste.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ste.c,v 1.24 2004/08/22 18:16:20 canacar Exp $ */ +/* $OpenBSD: if_ste.c,v 1.25 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -950,10 +950,8 @@ void ste_attach(parent, self, aux) ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = ste_ioctl; - ifp->if_output = ether_output; ifp->if_start = ste_start; ifp->if_watchdog = ste_watchdog; ifp->if_baudrate = 10000000; diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c index c767f7fbe4a..7bfa0533c02 100644 --- a/sys/dev/pci/if_ti.c +++ b/sys/dev/pci/if_ti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ti.c,v 1.55 2004/09/19 22:22:05 brad Exp $ */ +/* $OpenBSD: if_ti.c,v 1.56 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -1735,10 +1735,8 @@ ti_attach(parent, self, aux) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = ti_ioctl; - ifp->if_output = ether_output; ifp->if_start = ti_start; ifp->if_watchdog = ti_watchdog; - ifp->if_mtu = ETHERMTU; #if NVLAN >0 ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING; #endif diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index 8b05c8dfd88..0ac6e39c9e8 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tl.c,v 1.32 2004/09/14 22:39:03 brad Exp $ */ +/* $OpenBSD: if_tl.c,v 1.33 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, 1998 @@ -2146,10 +2146,8 @@ tl_attach(parent, self, aux) ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = tl_ioctl; - ifp->if_output = ether_output; ifp->if_start = tl_start; ifp->if_watchdog = tl_watchdog; ifp->if_baudrate = 10000000; diff --git a/sys/dev/pci/if_tx.c b/sys/dev/pci/if_tx.c index 81fdf57303d..eeac0f3c509 100644 --- a/sys/dev/pci/if_tx.c +++ b/sys/dev/pci/if_tx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tx.c,v 1.27 2003/08/19 14:01:35 mpech Exp $ */ +/* $OpenBSD: if_tx.c,v 1.28 2004/09/23 17:45:16 brad Exp $ */ /* $FreeBSD: src/sys/pci/if_tx.c,v 1.45 2001/02/07 20:11:02 semenu Exp $ */ /*- @@ -438,7 +438,6 @@ epic_freebsd_attach(dev) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST; ifp->if_ioctl = epic_ifioctl; - ifp->if_output = ether_output; ifp->if_start = epic_ifstart; ifp->if_watchdog = epic_ifwatchdog; ifp->if_init = (if_init_f_t*)epic_init; diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c index a6a7fd8eb71..61aba5a8a17 100644 --- a/sys/dev/pci/if_txp.c +++ b/sys/dev/pci/if_txp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_txp.c,v 1.72 2004/05/31 19:25:00 mcbride Exp $ */ +/* $OpenBSD: if_txp.c,v 1.73 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 2001 @@ -260,10 +260,8 @@ txp_attach(parent, self, aux) ifmedia_set(&sc->sc_ifmedia, IFM_ETHER|IFM_AUTO); ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = txp_ioctl; - ifp->if_output = ether_output; ifp->if_start = txp_start; ifp->if_watchdog = txp_watchdog; ifp->if_baudrate = 10000000; diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 1981f62d666..5b441ba3911 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.43 2004/06/06 17:56:36 mcbride Exp $ */ +/* $OpenBSD: if_vr.c,v 1.44 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, 1998 @@ -810,10 +810,8 @@ vr_attach(parent, self, aux) ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = vr_ioctl; - ifp->if_output = ether_output; ifp->if_start = vr_start; ifp->if_watchdog = vr_watchdog; ifp->if_baudrate = 10000000; diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c index de6d6ec090e..5d55b5740b2 100644 --- a/sys/dev/pci/if_wb.c +++ b/sys/dev/pci/if_wb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wb.c,v 1.23 2004/06/06 17:56:37 mcbride Exp $ */ +/* $OpenBSD: if_wb.c,v 1.24 2004/09/23 17:45:16 brad Exp $ */ /* * Copyright (c) 1997, 1998 @@ -856,10 +856,8 @@ wb_attach(parent, self, aux) bzero(sc->wb_ldata, sizeof(struct wb_list_data)); ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = wb_ioctl; - ifp->if_output = ether_output; ifp->if_start = wb_start; ifp->if_watchdog = wb_watchdog; ifp->if_baudrate = 10000000; diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index b4cfa0537ae..b80fd4d18a7 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_aue.c,v 1.34 2004/07/11 09:47:22 deraadt Exp $ */ +/* $OpenBSD: if_aue.c,v 1.35 2004/09/23 17:45:17 brad Exp $ */ /* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -815,7 +815,6 @@ USB_ATTACH(aue) /* Initialize interface info.*/ ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = aue_ioctl; ifp->if_start = aue_start; diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index 7a1814ac191..685ff808e27 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -516,7 +516,6 @@ USB_ATTACH(axe) /* Initialize interface info.*/ ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; strncpy(ifp->if_xname, devname, IFNAMSIZ); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = axe_ioctl; diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c index beee9fb4b74..a276c8c441e 100644 --- a/sys/dev/usb/if_cdce.c +++ b/sys/dev/usb/if_cdce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cdce.c,v 1.4 2004/07/21 15:54:54 deraadt Exp $ */ +/* $OpenBSD: if_cdce.c,v 1.5 2004/09/23 17:45:17 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com> @@ -228,7 +228,6 @@ USB_ATTACH(cdce) ifp = GET_IFP(sc); ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = cdce_ioctl; ifp->if_start = cdce_start; diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index d1b7c1b8bb8..f62b0e5f989 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cue.c,v 1.21 2004/07/08 22:18:44 deraadt Exp $ */ +/* $OpenBSD: if_cue.c,v 1.22 2004/09/23 17:45:17 brad Exp $ */ /* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -552,7 +552,6 @@ USB_ATTACH(cue) /* Initialize interface info.*/ ifp = GET_IFP(sc); ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = cue_ioctl; ifp->if_start = cue_start; diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index 2ad4491e4ac..4660f878da1 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_kue.c,v 1.26 2004/07/08 22:18:44 deraadt Exp $ */ +/* $OpenBSD: if_kue.c,v 1.27 2004/09/23 17:45:17 brad Exp $ */ /* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -524,7 +524,6 @@ USB_ATTACH(kue) /* Initialize interface info.*/ ifp = GET_IFP(sc); ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = kue_ioctl; ifp->if_start = kue_start; diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index 7939c9c3050..697cc1d0190 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_url.c,v 1.14 2004/07/08 22:18:44 deraadt Exp $ */ +/* $OpenBSD: if_url.c,v 1.15 2004/09/23 17:45:17 brad Exp $ */ /* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */ /* * Copyright (c) 2001, 2002 @@ -289,7 +289,6 @@ USB_ATTACH(url) /* initialize interface infomation */ ifp = GET_IFP(sc); ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; strncpy(ifp->if_xname, devname, IFNAMSIZ); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_start = url_start; |