Author: bschmidt
Date: Sat Jun 18 11:21:56 2011
New Revision: 223231
URL: http://svn.freebsd.org/changeset/base/223231
Log:
MFC r220635:
iwn_cleanup() is just a wrapper around iwn_detach(), call it directly
instead.
Modified:
stable/8/sys/dev/iwn/if_iwn.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/iwn/if_iwn.c
==============================================================================
--- stable/8/sys/dev/iwn/if_iwn.c Sat Jun 18 11:19:12 2011
(r223230)
+++ stable/8/sys/dev/iwn/if_iwn.c Sat Jun 18 11:21:56 2011
(r223231)
@@ -81,7 +81,6 @@ static struct ieee80211vap *iwn_vap_crea
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;
@@ -895,13 +894,6 @@ iwn_cleanup(device_t dev)
}
static int
-iwn_detach(device_t dev)
-{
- iwn_cleanup(dev);
- return 0;
-}
-
-static int
iwn_nic_lock(struct iwn_softc *sc)
{
int ntries;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
