summaryrefslogtreecommitdiff
path: root/sys/dev/ic/wi.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/ic/wi.c')
-rw-r--r--sys/dev/ic/wi.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/sys/dev/ic/wi.c b/sys/dev/ic/wi.c
index 787fcc481a9..602ce27ce55 100644
--- a/sys/dev/ic/wi.c
+++ b/sys/dev/ic/wi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wi.c,v 1.255 2020/01/30 04:56:11 thorpej Exp $ */
+/* $NetBSD: wi.c,v 1.256 2021/06/16 00:21:18 riastradh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.255 2020/01/30 04:56:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.256 2021/06/16 00:21:18 riastradh Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@@ -370,7 +370,7 @@ wi_attach(struct wi_softc *sc, const uint8_t *macaddr)
static const uint8_t empty_macaddr[IEEE80211_ADDR_LEN] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
- int s, rv;
+ int s;
sc->sc_soft_ih = softint_establish(SOFTINT_NET, wi_softintr, sc);
if (sc->sc_soft_ih == NULL) {
@@ -546,11 +546,7 @@ wi_attach(struct wi_softc *sc, const uint8_t *macaddr)
/*
* Call MI attach routines.
*/
- rv = if_initialize(ifp);
- if (rv != 0) {
- aprint_error_dev(sc->sc_dev, "if_initialize failed(%d)\n", rv);
- goto fail_2;
- }
+ if_initialize(ifp);
ieee80211_ifattach(ic);
/* Use common softint-based if_input */
ifp->if_percpuq = if_percpuq_create(ifp);
@@ -588,9 +584,6 @@ wi_attach(struct wi_softc *sc, const uint8_t *macaddr)
ieee80211_announce(ic);
return 0;
-fail_2:
- callout_destroy(&sc->sc_rssadapt_ch);
-
fail: splx(s);
softint_disestablish(sc->sc_soft_ih);
sc->sc_soft_ih = NULL;