src - OpenBSD base system

diff options


context:
space:
mode:

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 /sys/dev/pci
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@

Diffstat (limited to 'sys/dev/pci')

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

16 files changed, 16 insertions, 50 deletions

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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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;