diff options
author | Oleksij Rempel <linux@rempel-privat.de> | 2014-02-25 08:48:50 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-02-28 14:33:12 -0500 |
commit | 13f71050c10df77c1b9f2808c410d68dfcdb26b4 (patch) | |
tree | 99e05d30cd226bcf79bda77d261326fe919ace7f /drivers/net/wireless/ath/ath9k/xmit.c | |
parent | 031eb464fb4b7e475c4e8ca59502f017ae328704 (diff) |
ath9k: move ath9k_init_channels_rates to common-init
and rename it to ath9k_cmn_init_channels_rates.
sbands are move to ath_common as well.
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/xmit.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index a6507046dfe8..8f28711cfd4e 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -1076,6 +1076,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, | |||
1076 | struct ath_tx_info *info, int len, bool rts) | 1076 | struct ath_tx_info *info, int len, bool rts) |
1077 | { | 1077 | { |
1078 | struct ath_hw *ah = sc->sc_ah; | 1078 | struct ath_hw *ah = sc->sc_ah; |
1079 | struct ath_common *common = ath9k_hw_common(ah); | ||
1079 | struct sk_buff *skb; | 1080 | struct sk_buff *skb; |
1080 | struct ieee80211_tx_info *tx_info; | 1081 | struct ieee80211_tx_info *tx_info; |
1081 | struct ieee80211_tx_rate *rates; | 1082 | struct ieee80211_tx_rate *rates; |
@@ -1145,7 +1146,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, | |||
1145 | } | 1146 | } |
1146 | 1147 | ||
1147 | /* legacy rates */ | 1148 | /* legacy rates */ |
1148 | rate = &sc->sbands[tx_info->band].bitrates[rates[i].idx]; | 1149 | rate = &common->sbands[tx_info->band].bitrates[rates[i].idx]; |
1149 | if ((tx_info->band == IEEE80211_BAND_2GHZ) && | 1150 | if ((tx_info->band == IEEE80211_BAND_2GHZ) && |
1150 | !(rate->flags & IEEE80211_RATE_ERP_G)) | 1151 | !(rate->flags & IEEE80211_RATE_ERP_G)) |
1151 | phy = WLAN_RC_PHY_CCK; | 1152 | phy = WLAN_RC_PHY_CCK; |