diff options
author | Vasanthakumar Thiagarajan <vasanth@atheros.com> | 2009-09-09 05:55:49 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-09-09 11:25:25 -0400 |
commit | aeac355d23fb13a2082a8740ae7cf9408a71ec2c (patch) | |
tree | 831acd0d8035e29f4d72b31121a929fb28442cb4 /drivers/net/wireless/ath/ath9k/main.c | |
parent | 4d8cd26849737e141ff0aa23fedacef4ea76ea4f (diff) |
ath9k: Store subsystem id in struct hw_version
This subsystem id will be used later to turn on the btcoex
support.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index ce011ab5e89d..3dc7b5a13e64 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -1310,7 +1310,7 @@ static int ath9k_reg_notifier(struct wiphy *wiphy, | |||
1310 | * to allow the separation between hardware specific | 1310 | * to allow the separation between hardware specific |
1311 | * variables (now in ath_hw) and driver specific variables. | 1311 | * variables (now in ath_hw) and driver specific variables. |
1312 | */ | 1312 | */ |
1313 | static int ath_init_softc(u16 devid, struct ath_softc *sc) | 1313 | static int ath_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid) |
1314 | { | 1314 | { |
1315 | struct ath_hw *ah = NULL; | 1315 | struct ath_hw *ah = NULL; |
1316 | int r = 0, i; | 1316 | int r = 0, i; |
@@ -1348,6 +1348,7 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc) | |||
1348 | 1348 | ||
1349 | ah->ah_sc = sc; | 1349 | ah->ah_sc = sc; |
1350 | ah->hw_version.devid = devid; | 1350 | ah->hw_version.devid = devid; |
1351 | ah->hw_version.subsysid = subsysid; | ||
1351 | sc->sc_ah = ah; | 1352 | sc->sc_ah = ah; |
1352 | 1353 | ||
1353 | r = ath9k_hw_init(ah); | 1354 | r = ath9k_hw_init(ah); |
@@ -1577,7 +1578,7 @@ void ath_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) | |||
1577 | } | 1578 | } |
1578 | 1579 | ||
1579 | /* Device driver core initialization */ | 1580 | /* Device driver core initialization */ |
1580 | int ath_init_device(u16 devid, struct ath_softc *sc) | 1581 | int ath_init_device(u16 devid, struct ath_softc *sc, u16 subsysid) |
1581 | { | 1582 | { |
1582 | struct ieee80211_hw *hw = sc->hw; | 1583 | struct ieee80211_hw *hw = sc->hw; |
1583 | int error = 0, i; | 1584 | int error = 0, i; |
@@ -1585,7 +1586,7 @@ int ath_init_device(u16 devid, struct ath_softc *sc) | |||
1585 | 1586 | ||
1586 | DPRINTF(sc, ATH_DBG_CONFIG, "Attach ATH hw\n"); | 1587 | DPRINTF(sc, ATH_DBG_CONFIG, "Attach ATH hw\n"); |
1587 | 1588 | ||
1588 | error = ath_init_softc(devid, sc); | 1589 | error = ath_init_softc(devid, sc, subsysid); |
1589 | if (error != 0) | 1590 | if (error != 0) |
1590 | return error; | 1591 | return error; |
1591 | 1592 | ||