diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 751d803e1bc..91bffc91bbb 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -1292,7 +1292,13 @@ static int ath9k_reg_notifier(struct wiphy *wiphy, | |||
1292 | return ath_reg_notifier_apply(wiphy, request, reg); | 1292 | return ath_reg_notifier_apply(wiphy, request, reg); |
1293 | } | 1293 | } |
1294 | 1294 | ||
1295 | static int ath_init(u16 devid, struct ath_softc *sc) | 1295 | /* |
1296 | * Initialize and fill ath_softc, ath_sofct is the | ||
1297 | * "Software Carrier" struct. Historically it has existed | ||
1298 | * to allow the separation between hardware specific | ||
1299 | * variables (now in ath_hw) and driver specific variables. | ||
1300 | */ | ||
1301 | static int ath_init_softc(u16 devid, struct ath_softc *sc) | ||
1296 | { | 1302 | { |
1297 | struct ath_hw *ah = NULL; | 1303 | struct ath_hw *ah = NULL; |
1298 | int r = 0, i; | 1304 | int r = 0, i; |
@@ -1558,7 +1564,8 @@ void ath_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) | |||
1558 | &sc->sbands[IEEE80211_BAND_5GHZ]; | 1564 | &sc->sbands[IEEE80211_BAND_5GHZ]; |
1559 | } | 1565 | } |
1560 | 1566 | ||
1561 | int ath_attach(u16 devid, struct ath_softc *sc) | 1567 | /* Device driver core initialization */ |
1568 | int ath_init_device(u16 devid, struct ath_softc *sc) | ||
1562 | { | 1569 | { |
1563 | struct ieee80211_hw *hw = sc->hw; | 1570 | struct ieee80211_hw *hw = sc->hw; |
1564 | int error = 0, i; | 1571 | int error = 0, i; |
@@ -1566,7 +1573,7 @@ int ath_attach(u16 devid, struct ath_softc *sc) | |||
1566 | 1573 | ||
1567 | DPRINTF(sc, ATH_DBG_CONFIG, "Attach ATH hw\n"); | 1574 | DPRINTF(sc, ATH_DBG_CONFIG, "Attach ATH hw\n"); |
1568 | 1575 | ||
1569 | error = ath_init(devid, sc); | 1576 | error = ath_init_softc(devid, sc); |
1570 | if (error != 0) | 1577 | if (error != 0) |
1571 | return error; | 1578 | return error; |
1572 | 1579 | ||