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@

8 files changed, 8 insertions, 20 deletions

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