remove the unused if_init callback in struct ifnet

ok deraadt@ henning@ claudio@

11 files changed, 11 insertions, 22 deletions

diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index cba71b01ec1..ae199d815ac 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx.c,v 1.96 2010/08/07 03:50:01 krw Exp $ */
+/*	$OpenBSD: acx.c,v 1.97 2010/08/27 17:08:00 jsg Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -289,7 +289,6 @@ acx_attach(struct acx_softc *sc)
 	}
 
 	ifp->if_softc = sc;
-	ifp->if_init = acx_init;
 	ifp->if_ioctl = acx_ioctl;
 	ifp->if_start = acx_start;
 	ifp->if_watchdog = acx_watchdog;
diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index ca8d8864358..244a2f5c809 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: an.c,v 1.57 2009/08/10 20:29:54 deraadt Exp $	*/
+/*	$OpenBSD: an.c,v 1.58 2010/08/27 17:08:00 jsg Exp $	*/
 /*	$NetBSD: an.c,v 1.34 2005/06/20 02:49:18 atatat Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -275,7 +275,6 @@ an_attach(struct an_softc *sc)
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = an_ioctl;
 	ifp->if_start = an_start;
-	ifp->if_init = an_init;
 	ifp->if_watchdog = an_watchdog;
 	IFQ_SET_READY(&ifp->if_snd);
 
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index bf43d6769f9..e3c148a0227 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ath.c,v 1.88 2010/08/27 04:09:18 deraadt Exp $  */
+/*      $OpenBSD: ath.c,v 1.89 2010/08/27 17:08:00 jsg Exp $  */
 /*	$NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $	*/
 
 /*-
@@ -350,7 +350,6 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
 	ifp->if_watchdog = ath_watchdog;
 	ifp->if_ioctl = ath_ioctl;
 #ifndef __OpenBSD__
-	ifp->if_init = ath_init;
 	ifp->if_stop = ath_stop;		/* XXX */
 #endif
 	IFQ_SET_MAXLEN(&ifp->if_snd, ATH_TXBUF * ATH_TXDESC);
diff --git a/sys/dev/ic/athn.c b/sys/dev/ic/athn.c
index bcd04a52e96..6719cecf029 100644
--- a/sys/dev/ic/athn.c
+++ b/sys/dev/ic/athn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: athn.c,v 1.62 2010/08/18 18:58:01 damien Exp $	*/
+/*	$OpenBSD: athn.c,v 1.63 2010/08/27 17:08:00 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -330,7 +330,6 @@ athn_attach(struct athn_softc *sc)
 
 	ifp->if_softc = sc;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-	ifp->if_init = athn_init;
 	ifp->if_ioctl = athn_ioctl;
 	ifp->if_start = athn_start;
 	ifp->if_watchdog = athn_watchdog;
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index c2c82cf7b05..89be52d8cdd 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwi.c,v 1.94 2010/08/07 03:50:01 krw Exp $	*/
+/*	$OpenBSD: bwi.c,v 1.95 2010/08/27 17:08:00 jsg Exp $	*/
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -798,7 +798,6 @@ bwi_attach(struct bwi_softc *sc)
 
 	/* setup interface */
 	ifp->if_softc = sc;
-	ifp->if_init = bwi_init;
 	ifp->if_ioctl = bwi_ioctl;
 	ifp->if_start = bwi_start;
 	ifp->if_watchdog = bwi_watchdog;
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index 3dd897f25f9..ef3006339c6 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malo.c,v 1.91 2010/08/08 16:36:33 deraadt Exp $ */
+/*	$OpenBSD: malo.c,v 1.92 2010/08/27 17:08:00 jsg Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -347,7 +347,6 @@ malo_attach(struct malo_softc *sc)
 
 	/* setup interface */
 	ifp->if_softc = sc;
-	ifp->if_init = malo_init;
 	ifp->if_ioctl = malo_ioctl;
 	ifp->if_start = malo_start;
 	ifp->if_watchdog = malo_watchdog;
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index 6c1026b25c3..4df90aed28b 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pgt.c,v 1.62 2010/08/27 04:09:18 deraadt Exp $  */
+/*	$OpenBSD: pgt.c,v 1.63 2010/08/27 17:08:00 jsg Exp $  */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -1891,7 +1891,6 @@ pgt_net_attach(struct pgt_softc *sc)
 		return (error);
 
 	ifp->if_softc = sc;
-	ifp->if_init = pgt_init;
 	ifp->if_ioctl = pgt_ioctl;
 	ifp->if_start = pgt_start;
 	ifp->if_watchdog = pgt_watchdog;
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index 6f6f7f20df6..bb55cb317a5 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: re.c,v 1.127 2010/08/08 21:00:31 krw Exp $	*/
+/*	$OpenBSD: re.c,v 1.128 2010/08/27 17:08:00 jsg Exp $	*/
 /*	$FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $	*/
 /*
  * Copyright (c) 1997, 1998-2003
@@ -1104,7 +1104,6 @@ re_attach(struct rl_softc *sc, const char *intrstr)
 	ifp->if_ioctl = re_ioctl;
 	ifp->if_start = re_start;
 	ifp->if_watchdog = re_watchdog;
-	ifp->if_init = re_init;
 	if ((sc->rl_flags & RL_FLAG_NOJUMBO) == 0)
 		ifp->if_hardmtu = RL_JUMBO_MTU;
 	IFQ_SET_MAXLEN(&ifp->if_snd, RL_TX_QLEN);
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index 9117461951d..eaa0c1b1424 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2560.c,v 1.52 2010/08/27 16:06:25 kettenis Exp $  */
+/*	$OpenBSD: rt2560.c,v 1.53 2010/08/27 17:08:00 jsg Exp $  */
 
 /*-
  * Copyright (c) 2005, 2006
@@ -265,7 +265,6 @@ rt2560_attach(void *xsc, int id)
 
 	ifp->if_softc = sc;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-	ifp->if_init = rt2560_init;
 	ifp->if_ioctl = rt2560_ioctl;
 	ifp->if_start = rt2560_start;
 	ifp->if_watchdog = rt2560_watchdog;
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 456ac8d0ed6..07996c05f0d 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2661.c,v 1.58 2010/08/27 16:06:25 kettenis Exp $	*/
+/*	$OpenBSD: rt2661.c,v 1.59 2010/08/27 17:08:00 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -342,7 +342,6 @@ rt2661_attachhook(void *xsc)
 
 	ifp->if_softc = sc;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-	ifp->if_init = rt2661_init;
 	ifp->if_ioctl = rt2661_ioctl;
 	ifp->if_start = rt2661_start;
 	ifp->if_watchdog = rt2661_watchdog;
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index f4fadc55ef1..492bdd697d3 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2860.c,v 1.60 2010/08/27 16:06:25 kettenis Exp $	*/
+/*	$OpenBSD: rt2860.c,v 1.61 2010/08/27 17:08:00 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -357,7 +357,6 @@ rt2860_attachhook(void *xsc)
 
 	ifp->if_softc = sc;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-	ifp->if_init = rt2860_init;
 	ifp->if_ioctl = rt2860_ioctl;
 	ifp->if_start = rt2860_start;
 	ifp->if_watchdog = rt2860_watchdog;