diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2005-06-10 16:49:24 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2005-06-10 16:49:24 +0000 |
| commit | fc74a9f93a5fbc83262aa12084404ac953c854b5 (patch) | |
| tree | f65b6d7834b40dfcd48534829a0a1e9529ab87ee /sys/dev/ipw | |
| parent | 7f1d8b7517a6a93379974243551e0ec0a96cb54e (diff) | |
Notes
Diffstat (limited to 'sys/dev/ipw')
| -rw-r--r-- | sys/dev/ipw/if_ipw.c | 13 | ||||
| -rw-r--r-- | sys/dev/ipw/if_ipwvar.h | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c index 37c1c979fc58..11322afc5cc3 100644 --- a/sys/dev/ipw/if_ipw.c +++ b/sys/dev/ipw/if_ipw.c @@ -214,7 +214,7 @@ static int ipw_attach(device_t dev) { struct ipw_softc *sc = device_get_softc(dev); - struct ifnet *ifp = &sc->sc_arp.ac_if; + struct ifnet *ifp; struct ieee80211com *ic = &sc->sc_ic; uint16_t val; int error, i; @@ -263,7 +263,11 @@ ipw_attach(device_t dev) device_printf(dev, "could not allocate DMA resources\n"); goto fail; } - + ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + if (ifp == NULL) { + device_printf(dev, "can not if_alloc()\n"); + goto fail; + } ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; @@ -387,8 +391,11 @@ ipw_detach(device_t dev) IPW_UNLOCK(sc); - bpfdetach(ifp); + if (ifp != NULL) + bpfdetach(ifp); ieee80211_ifdetach(ic); + if (ifp != NULL) + if_free(ifp); ipw_release(sc); diff --git a/sys/dev/ipw/if_ipwvar.h b/sys/dev/ipw/if_ipwvar.h index ae0e80a976fa..e1f3ea1f6916 100644 --- a/sys/dev/ipw/if_ipwvar.h +++ b/sys/dev/ipw/if_ipwvar.h @@ -84,7 +84,7 @@ struct ipw_tx_radiotap_header { (1 << IEEE80211_RADIOTAP_CHANNEL)) struct ipw_softc { - struct arpcom sc_arp; + struct ifnet *sc_ifp; struct ieee80211com sc_ic; int (*sc_newstate)(struct ieee80211com *, enum ieee80211_state, int); |