d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwn_cleanup() is just a wrapper around iwn_detach(), call it directly

Browse Source 
instead.
This commit is contained in:
bschmidt 2011-04-14 17:31:34 +00:00
parent edf1993df3
commit e8c8ce01fd
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/iwn/if_iwn.c
View File

@ -81,7 +81,6 @@ static struct ieee80211vap *iwn_vap_create(struct ieee80211com *,
int flags, const uint8_t bssid[IEEE80211_ADDR_LEN],
const uint8_t mac[IEEE80211_ADDR_LEN]);
static void iwn_vap_delete(struct ieee80211vap *);
static int iwn_cleanup(device_t);
static int iwn_detach(device_t);
static int iwn_nic_lock(struct iwn_softc *);
static int iwn_eeprom_lock(struct iwn_softc *);
@ -684,7 +683,7 @@ iwn_attach(device_t dev)
ieee80211_announce(ic);
return 0;
fail:
iwn_cleanup(dev);
iwn_detach(dev);
return error;
}
@ -845,7 +844,7 @@ iwn_vap_delete(struct ieee80211vap *vap)
}
static int
iwn_cleanup(device_t dev)
iwn_detach(device_t dev)
{
struct iwn_softc *sc = device_get_softc(dev);
struct ifnet *ifp = sc->sc_ifp;
@ -894,13 +893,6 @@ iwn_cleanup(device_t dev)
return 0;
}
static int
iwn_detach(device_t dev)
{
iwn_cleanup(dev);
return 0;
}
static int
iwn_nic_lock(struct iwn_softc *sc)
{