diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index fddda206def2..de197117fdcf 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -1293,7 +1293,7 @@ static int ath9k_reg_notifier(struct wiphy *wiphy, | |||
1293 | struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); | 1293 | struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); |
1294 | struct ath_wiphy *aphy = hw->priv; | 1294 | struct ath_wiphy *aphy = hw->priv; |
1295 | struct ath_softc *sc = aphy->sc; | 1295 | struct ath_softc *sc = aphy->sc; |
1296 | struct ath_regulatory *reg = &sc->sc_ah->regulatory; | 1296 | struct ath_regulatory *reg = &sc->common.regulatory; |
1297 | 1297 | ||
1298 | return ath_reg_notifier_apply(wiphy, request, reg); | 1298 | return ath_reg_notifier_apply(wiphy, request, reg); |
1299 | } | 1299 | } |
@@ -1586,12 +1586,12 @@ int ath_init_device(u16 devid, struct ath_softc *sc) | |||
1586 | 1586 | ||
1587 | ath_set_hw_capab(sc, hw); | 1587 | ath_set_hw_capab(sc, hw); |
1588 | 1588 | ||
1589 | error = ath_regd_init(&sc->sc_ah->regulatory, sc->hw->wiphy, | 1589 | error = ath_regd_init(&sc->common.regulatory, sc->hw->wiphy, |
1590 | ath9k_reg_notifier); | 1590 | ath9k_reg_notifier); |
1591 | if (error) | 1591 | if (error) |
1592 | return error; | 1592 | return error; |
1593 | 1593 | ||
1594 | reg = &sc->sc_ah->regulatory; | 1594 | reg = &sc->common.regulatory; |
1595 | 1595 | ||
1596 | if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) { | 1596 | if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) { |
1597 | setup_ht_cap(sc, &sc->sbands[IEEE80211_BAND_2GHZ].ht_cap); | 1597 | setup_ht_cap(sc, &sc->sbands[IEEE80211_BAND_2GHZ].ht_cap); |