diff options
39 files changed, 46 insertions, 89 deletions
diff --git a/sys/arch/vax/qbus/if_de.c b/sys/arch/vax/qbus/if_de.c index d1e69e421e4..53e556f15c6 100644 --- a/sys/arch/vax/qbus/if_de.c +++ b/sys/arch/vax/qbus/if_de.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_de.c,v 1.8 2007/05/10 17:59:26 deraadt Exp $ */ +/* $OpenBSD: if_de.c,v 1.9 2010/08/27 17:08:01 jsg Exp $ */ /* $NetBSD: if_de.c,v 1.11 2001/11/13 07:11:24 lukem Exp $ */ /* @@ -230,7 +230,6 @@ deattach(struct device *parent, struct device *self, void *aux) ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI; ifp->if_ioctl = deioctl; ifp->if_start = destart; - ifp->if_init = deinit; ifp->if_stop = destop; IFQ_SET_READY(&ifp->if_snd); 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; diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c index 2bdb8ae629d..69bc9e2ad2a 100644 --- a/sys/dev/pci/if_age.c +++ b/sys/dev/pci/if_age.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_age.c,v 1.11 2010/05/19 14:39:07 oga Exp $ */ +/* $OpenBSD: if_age.c,v 1.12 2010/08/27 17:08:00 jsg Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> @@ -228,7 +228,6 @@ age_attach(struct device *parent, struct device *self, void *aux) ifp = &sc->sc_arpcom.ac_if; ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = age_init; ifp->if_ioctl = age_ioctl; ifp->if_start = age_start; ifp->if_watchdog = age_watchdog; diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c index 1d1a63e1993..83805995029 100644 --- a/sys/dev/pci/if_alc.c +++ b/sys/dev/pci/if_alc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_alc.c,v 1.6 2010/07/27 22:39:59 deraadt Exp $ */ +/* $OpenBSD: if_alc.c,v 1.7 2010/08/27 17:08:00 jsg Exp $ */ /*- * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -589,7 +589,6 @@ alc_attach(struct device *parent, struct device *self, void *aux) ifp = &sc->sc_arpcom.ac_if; ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = alc_init; ifp->if_ioctl = alc_ioctl; ifp->if_start = alc_start; ifp->if_watchdog = alc_watchdog; diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c index b579bc15e40..0107de767a4 100644 --- a/sys/dev/pci/if_ale.c +++ b/sys/dev/pci/if_ale.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ale.c,v 1.14 2010/07/27 00:03:03 deraadt Exp $ */ +/* $OpenBSD: if_ale.c,v 1.15 2010/08/27 17:08:00 jsg Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -512,7 +512,6 @@ ale_attach(struct device *parent, struct device *self, void *aux) ifp = &sc->sc_arpcom.ac_if; ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = ale_init; ifp->if_ioctl = ale_ioctl; ifp->if_start = ale_start; ifp->if_watchdog = ale_watchdog; diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c index 9cf4a040872..706e9af1612 100644 --- a/sys/dev/pci/if_bce.c +++ b/sys/dev/pci/if_bce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bce.c,v 1.30 2010/07/27 21:40:40 deraadt Exp $ */ +/* $OpenBSD: if_bce.c,v 1.31 2010/08/27 17:08:00 jsg Exp $ */ /* $NetBSD: if_bce.c,v 1.3 2003/09/29 01:53:02 mrg Exp $ */ /* @@ -371,7 +371,6 @@ bce_attach(struct device *parent, struct device *self, void *aux) ifp->if_ioctl = bce_ioctl; ifp->if_start = bce_start; ifp->if_watchdog = bce_watchdog; - ifp->if_init = bce_init; IFQ_SET_READY(&ifp->if_snd); ifp->if_capabilities = IFCAP_VLAN_MTU; diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c index 31ed0ead832..d53b4fc53b3 100644 --- a/sys/dev/pci/if_et.c +++ b/sys/dev/pci/if_et.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_et.c,v 1.20 2010/05/19 15:27:35 oga Exp $ */ +/* $OpenBSD: if_et.c,v 1.21 2010/08/27 17:08:00 jsg Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. * @@ -251,7 +251,6 @@ et_attach(struct device *parent, struct device *self, void *aux) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = et_init; ifp->if_ioctl = et_ioctl; ifp->if_start = et_start; ifp->if_watchdog = et_watchdog; diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c index b2407f5b57b..2a9d2474433 100644 --- a/sys/dev/pci/if_ipw.c +++ b/sys/dev/pci/if_ipw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ipw.c,v 1.90 2010/08/12 16:59:29 damien Exp $ */ +/* $OpenBSD: if_ipw.c,v 1.91 2010/08/27 17:08:00 jsg Exp $ */ /*- * Copyright (c) 2004-2008 @@ -263,7 +263,6 @@ ipw_attach(struct device *parent, struct device *self, void *aux) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = ipw_init; ifp->if_ioctl = ipw_ioctl; ifp->if_start = ipw_start; ifp->if_watchdog = ipw_watchdog; diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index 9dc4517fe6e..414f9d6f557 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwi.c,v 1.107 2010/08/12 16:59:29 damien Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.108 2010/08/27 17:08:00 jsg Exp $ */ /*- * Copyright (c) 2004-2008 @@ -299,7 +299,6 @@ iwi_attach(struct device *parent, struct device *self, void *aux) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = iwi_init; ifp->if_ioctl = iwi_ioctl; ifp->if_start = iwi_start; ifp->if_watchdog = iwi_watchdog; diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 3c0b0df7bce..15a95b7fd59 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.102 2010/08/12 16:59:29 damien Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.103 2010/08/27 17:08:00 jsg Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -533,7 +533,6 @@ iwn_attach(struct device *parent, struct device *self, void *aux) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = iwn_init; ifp->if_ioctl = iwn_ioctl; ifp->if_start = iwn_start; ifp->if_watchdog = iwn_watchdog; diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c index bd75ce4cc31..4a855fddd68 100644 --- a/sys/dev/pci/if_jme.c +++ b/sys/dev/pci/if_jme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_jme.c,v 1.23 2010/08/07 03:50:02 krw Exp $ */ +/* $OpenBSD: if_jme.c,v 1.24 2010/08/27 17:08:00 jsg Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -606,7 +606,6 @@ jme_attach(struct device *parent, struct device *self, void *aux) ifp = &sc->sc_arpcom.ac_if; ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = jme_init; ifp->if_ioctl = jme_ioctl; ifp->if_start = jme_start; ifp->if_watchdog = jme_watchdog; diff --git a/sys/dev/pci/if_lii.c b/sys/dev/pci/if_lii.c index fd19da426dc..1b9bb2562ab 100644 --- a/sys/dev/pci/if_lii.c +++ b/sys/dev/pci/if_lii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lii.c,v 1.27 2010/07/26 22:21:59 deraadt Exp $ */ +/* $OpenBSD: if_lii.c,v 1.28 2010/08/27 17:08:00 jsg Exp $ */ /* * Copyright (c) 2007 The NetBSD Foundation. @@ -271,7 +271,6 @@ lii_attach(struct device *parent, struct device *self, void *aux) ifp->if_ioctl = lii_ioctl; ifp->if_start = lii_start; ifp->if_watchdog = lii_watchdog; - ifp->if_init = lii_init; IFQ_SET_READY(&ifp->if_snd); if_attach(ifp); diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index 989b5959342..57692319a27 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nfe.c,v 1.91 2010/08/06 03:02:24 mlarkin Exp $ */ +/* $OpenBSD: if_nfe.c,v 1.92 2010/08/27 17:08:00 jsg Exp $ */ /*- * Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr> @@ -338,7 +338,6 @@ nfe_attach(struct device *parent, struct device *self, void *aux) ifp->if_ioctl = nfe_ioctl; ifp->if_start = nfe_start; ifp->if_watchdog = nfe_watchdog; - ifp->if_init = nfe_init; ifp->if_baudrate = IF_Gbps(1); IFQ_SET_MAXLEN(&ifp->if_snd, NFE_IFQ_MAXLEN); IFQ_SET_READY(&ifp->if_snd); diff --git a/sys/dev/pci/if_se.c b/sys/dev/pci/if_se.c index 624d6c0b2cb..45be6a4997e 100644 --- a/sys/dev/pci/if_se.c +++ b/sys/dev/pci/if_se.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_se.c,v 1.2 2010/04/02 22:42:55 jsg Exp $ */ +/* $OpenBSD: if_se.c,v 1.3 2010/08/27 17:08:00 jsg Exp $ */ /*- * Copyright (c) 2009, 2010 Christopher Zimmermann <madroach@zakweb.de> @@ -628,7 +628,6 @@ se_attach(parent, self, aux) ifp->if_start = se_start; ifp->if_watchdog = se_watchdog; ifp->if_baudrate = IF_Mbps(100); - ifp->if_init = se_init; IFQ_SET_MAXLEN(&ifp->if_snd, SE_TX_RING_CNT - 1); IFQ_SET_READY(&ifp->if_snd); bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ); diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c index b11a9014bee..21af7e90866 100644 --- a/sys/dev/pci/if_vge.c +++ b/sys/dev/pci/if_vge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vge.c,v 1.47 2010/02/24 21:44:12 kettenis Exp $ */ +/* $OpenBSD: if_vge.c,v 1.48 2010/08/27 17:08:00 jsg Exp $ */ /* $FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $ */ /* * Copyright (c) 2004 @@ -787,7 +787,6 @@ vge_attach(struct device *parent, struct device *self, void *aux) ifp->if_ioctl = vge_ioctl; ifp->if_start = vge_start; ifp->if_watchdog = vge_watchdog; - ifp->if_init = vge_init; ifp->if_baudrate = 1000000000; #ifdef VGE_JUMBO ifp->if_hardmtu = VGE_JUMBO_MTU; diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 6458e6bbe61..b7f47d4a139 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.106 2010/08/12 16:59:29 damien Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.107 2010/08/27 17:08:00 jsg Exp $ */ /*- * Copyright (c) 2006-2008 @@ -301,7 +301,6 @@ wpi_attach(struct device *parent, struct device *self, void *aux) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = wpi_init; ifp->if_ioctl = wpi_ioctl; ifp->if_start = wpi_start; ifp->if_watchdog = wpi_watchdog; diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c index 7394617fd4e..f97141ab59f 100644 --- a/sys/dev/pcmcia/if_malo.c +++ b/sys/dev/pcmcia/if_malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo.c,v 1.69 2010/07/02 03:13:42 tedu Exp $ */ +/* $OpenBSD: if_malo.c,v 1.70 2010/08/27 17:08:00 jsg Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -301,7 +301,6 @@ cmalo_attach(void *arg) /* setup interface */ ifp->if_softc = sc; ifp->if_ioctl = cmalo_ioctl; - ifp->if_init = cmalo_init; ifp->if_start = cmalo_start; ifp->if_watchdog = cmalo_watchdog; ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST; diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c index 7c9aaad08e0..00104ad12a6 100644 --- a/sys/dev/usb/if_otus.c +++ b/sys/dev/usb/if_otus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_otus.c,v 1.17 2010/04/20 22:05:43 tedu Exp $ */ +/* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -366,7 +366,6 @@ otus_attachhook(void *xsc) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = otus_init; ifp->if_ioctl = otus_ioctl; ifp->if_start = otus_start; ifp->if_watchdog = otus_watchdog; diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c index 7f16572aef0..5d345e51d0a 100644 --- a/sys/dev/usb/if_ral.c +++ b/sys/dev/usb/if_ral.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral.c,v 1.112 2010/04/20 22:05:43 tedu Exp $ */ +/* $OpenBSD: if_ral.c,v 1.113 2010/08/27 17:08:01 jsg Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -322,7 +322,6 @@ ural_attach(struct device *parent, struct device *self, void *aux) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = ural_init; ifp->if_ioctl = ural_ioctl; ifp->if_start = ural_start; ifp->if_watchdog = ural_watchdog; diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index ff7362bf973..0cbff7282c6 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rum.c,v 1.89 2010/07/02 03:13:42 tedu Exp $ */ +/* $OpenBSD: if_rum.c,v 1.90 2010/08/27 17:08:01 jsg Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -419,7 +419,6 @@ rum_attach(struct device *parent, struct device *self, void *aux) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = rum_init; ifp->if_ioctl = rum_ioctl; ifp->if_start = rum_start; ifp->if_watchdog = rum_watchdog; diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c index ab852e8c689..7a0756c60c2 100644 --- a/sys/dev/usb/if_run.c +++ b/sys/dev/usb/if_run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_run.c,v 1.70 2010/04/29 07:42:52 jasper Exp $ */ +/* $OpenBSD: if_run.c,v 1.71 2010/08/27 17:08:01 jsg Exp $ */ /*- * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -545,7 +545,6 @@ run_attach(struct device *parent, struct device *self, void *aux) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = run_init; ifp->if_ioctl = run_ioctl; ifp->if_start = run_start; ifp->if_watchdog = run_watchdog; diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index f15a62650c5..37bfc6e8c66 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.42 2010/06/29 07:12:31 matthew Exp $ */ +/* $OpenBSD: if_uath.c,v 1.43 2010/08/27 17:08:01 jsg Exp $ */ /*- * Copyright (c) 2006 @@ -391,7 +391,6 @@ uath_attach(struct device *parent, struct device *self, void *aux) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = uath_init; ifp->if_ioctl = uath_ioctl; ifp->if_start = uath_start; ifp->if_watchdog = uath_watchdog; diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c index 59ef36f35d4..90a6528df84 100644 --- a/sys/dev/usb/if_upgt.c +++ b/sys/dev/usb/if_upgt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */ +/* $OpenBSD: if_upgt.c,v 1.50 2010/08/27 17:08:01 jsg Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -421,7 +421,6 @@ upgt_attach_hook(void *arg) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = upgt_init; ifp->if_ioctl = upgt_ioctl; ifp->if_start = upgt_start; ifp->if_watchdog = upgt_watchdog; diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c index 80b1abdab59..0b150b356b2 100644 --- a/sys/dev/usb/if_urtw.c +++ b/sys/dev/usb/if_urtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtw.c,v 1.30 2010/08/07 03:50:02 krw Exp $ */ +/* $OpenBSD: if_urtw.c,v 1.31 2010/08/27 17:08:01 jsg Exp $ */ /*- * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org> @@ -724,9 +724,9 @@ urtw_attach(struct device *parent, struct device *self, void *aux) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; if (sc->sc_hwrev & URTW_HWREV_8187) { - ifp->if_init = urtw_init; + sc->sc_init = urtw_init; } else { - ifp->if_init = urtw_8187b_init; + sc->sc_init = urtw_8187b_init; } ifp->if_ioctl = urtw_ioctl; ifp->if_start = urtw_start; @@ -1028,6 +1028,7 @@ urtw_free_tx_data_list(struct urtw_softc *sc) int urtw_media_change(struct ifnet *ifp) { + struct urtw_softc *sc = ifp->if_softc; int error; error = ieee80211_media_change(ifp); @@ -1036,7 +1037,7 @@ urtw_media_change(struct ifnet *ifp) if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) == (IFF_UP | IFF_RUNNING)) - ifp->if_init(ifp); + sc->sc_init(ifp); return (0); } @@ -2412,7 +2413,7 @@ urtw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) urtw_set_multi(sc); } else { if (!(ifp->if_flags & IFF_RUNNING)) - ifp->if_init(ifp); + sc->sc_init(ifp); } } else { if (ifp->if_flags & IFF_RUNNING) @@ -2455,7 +2456,7 @@ urtw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) if (error == ENETRESET) { if ((ifp->if_flags & (IFF_RUNNING | IFF_UP)) == (IFF_RUNNING | IFF_UP)) - ifp->if_init(ifp); + sc->sc_init(ifp); error = 0; } diff --git a/sys/dev/usb/if_urtwreg.h b/sys/dev/usb/if_urtwreg.h index b6e0ee16e59..1d67a95604e 100644 --- a/sys/dev/usb/if_urtwreg.h +++ b/sys/dev/usb/if_urtwreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtwreg.h,v 1.12 2009/06/06 12:06:28 martynas Exp $ */ +/* $OpenBSD: if_urtwreg.h,v 1.13 2010/08/27 17:08:01 jsg Exp $ */ /*- * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org> @@ -323,6 +323,7 @@ struct urtw_softc { struct ieee80211com sc_ic; int (*sc_newstate)(struct ieee80211com *, enum ieee80211_state, int); + int (*sc_init)(struct ifnet *); struct urtw_rf sc_rf; struct usb_task sc_task; diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index 4d06cae4e84..fad1dec65f9 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_zyd.c,v 1.81 2009/11/22 22:13:51 jsg Exp $ */ +/* $OpenBSD: if_zyd.c,v 1.82 2010/08/27 17:08:01 jsg Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -398,7 +398,6 @@ zyd_complete_attach(struct zyd_softc *sc) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_init = zyd_init; ifp->if_ioctl = zyd_ioctl; ifp->if_start = zyd_start; ifp->if_watchdog = zyd_watchdog; diff --git a/sys/dev/usb/ueagle.c b/sys/dev/usb/ueagle.c index 2f90850a459..46f17b247cf 100644 --- a/sys/dev/usb/ueagle.c +++ b/sys/dev/usb/ueagle.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ueagle.c,v 1.26 2010/06/05 13:06:57 damien Exp $ */ +/* $OpenBSD: ueagle.c,v 1.27 2010/08/27 17:08:01 jsg Exp $ */ /*- * Copyright (c) 2003-2006 @@ -214,7 +214,6 @@ ueagle_attach(struct device *parent, struct device *self, void *aux) ifp->if_softc = sc; ifp->if_flags = IFF_SIMPLEX; - ifp->if_init = ueagle_init; ifp->if_ioctl = ueagle_ioctl; ifp->if_start = ueagle_start; IFQ_SET_READY(&ifp->if_snd); diff --git a/sys/net/if.c b/sys/net/if.c index 156b9e94992..f34ed4a58d6 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.224 2010/08/25 14:07:24 claudio Exp $ */ +/* $OpenBSD: if.c,v 1.225 2010/08/27 17:08:01 jsg Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -141,7 +141,6 @@ int ifqmaxlen = IFQ_MAXLEN; void if_detach_queues(struct ifnet *, struct ifqueue *); void if_detached_start(struct ifnet *); int if_detached_ioctl(struct ifnet *, u_long, caddr_t); -int if_detached_init(struct ifnet *); void if_detached_watchdog(struct ifnet *); int if_getgroup(caddr_t, struct ifnet *); @@ -521,7 +520,6 @@ if_detach(struct ifnet *ifp) ifp->if_flags &= ~IFF_OACTIVE; ifp->if_start = if_detached_start; ifp->if_ioctl = if_detached_ioctl; - ifp->if_init = if_detached_init; ifp->if_watchdog = if_detached_watchdog; /* Call detach hooks, ie. to remove vlan interfaces */ @@ -1799,12 +1797,6 @@ if_detached_ioctl(struct ifnet *ifp, u_long a, caddr_t b) return ENODEV; } -int -if_detached_init(struct ifnet *ifp) -{ - return (ENXIO); -} - void if_detached_watchdog(struct ifnet *ifp) { diff --git a/sys/net/if.h b/sys/net/if.h index b1d880376b8..f28e6f397f5 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if.h,v 1.117 2010/06/26 19:49:54 claudio Exp $ */ +/* $OpenBSD: if.h,v 1.118 2010/08/27 17:08:01 jsg Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -274,8 +274,6 @@ struct ifnet { /* and the entries */ void (*if_start)(struct ifnet *); /* ioctl routine */ int (*if_ioctl)(struct ifnet *, u_long, caddr_t); - /* init routine */ - int (*if_init)(struct ifnet *); /* stop routine */ int (*if_stop)(struct ifnet *, int); /* timer routine */ |