evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ath9k_htc: move beaconq to struct htc_beacon

Browse source 
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Oleksij Rempel 2014-03-01 21:15:46 +01:00 • committed by John W. Linville
parent 3c4816d9a3
commit a099874ed9
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/ath/ath9k/htc.h
View file

@ -409,6 +409,7 @@ static inline void ath9k_htc_err_stat_rx(struct ath9k_htc_priv *priv,
struct htc_beacon { struct htc_beacon {
struct ieee80211_vif *bslot[ATH9K_HTC_MAX_BCN_VIF]; struct ieee80211_vif *bslot[ATH9K_HTC_MAX_BCN_VIF];
u32 bmisscnt; u32 bmisscnt;
u32 beaconq;
}; };
struct ath_btcoex { struct ath_btcoex {
@ -512,7 +513,6 @@ struct ath9k_htc_priv {
struct work_struct led_work; struct work_struct led_work;
#endif #endif
int beaconq;
int cabq; int cabq;
int hwq_map[IEEE80211_NUM_ACS]; int hwq_map[IEEE80211_NUM_ACS];

8
drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
View file

@ -26,7 +26,7 @@ void ath9k_htc_beaconq_config(struct ath9k_htc_priv *priv)
memset(&qi, 0, sizeof(struct ath9k_tx_queue_info)); memset(&qi, 0, sizeof(struct ath9k_tx_queue_info));
memset(&qi_be, 0, sizeof(struct ath9k_tx_queue_info)); memset(&qi_be, 0, sizeof(struct ath9k_tx_queue_info));
ath9k_hw_get_txq_props(ah, priv->beaconq, &qi); ath9k_hw_get_txq_props(ah, priv->beacon.beaconq, &qi);
if (priv->ah->opmode == NL80211_IFTYPE_AP || if (priv->ah->opmode == NL80211_IFTYPE_AP ||
priv->ah->opmode == NL80211_IFTYPE_MESH_POINT) { priv->ah->opmode == NL80211_IFTYPE_MESH_POINT) {
@ -54,11 +54,11 @@ void ath9k_htc_beaconq_config(struct ath9k_htc_priv *priv)
} }
if (!ath9k_hw_set_txq_props(ah, priv->beaconq, &qi)) { if (!ath9k_hw_set_txq_props(ah, priv->beacon.beaconq, &qi)) {
ath_err(ath9k_hw_common(ah), ath_err(ath9k_hw_common(ah),
"Unable to update beacon queue %u!\n", priv->beaconq); "Unable to update beacon queue %u!\n", priv->beacon.beaconq);
} else { } else {
ath9k_hw_resettxqueue(ah, priv->beaconq); ath9k_hw_resettxqueue(ah, priv->beacon.beaconq);
} }
} }

4
drivers/net/wireless/ath/ath9k/htc_drv_init.c
View file

@ -405,8 +405,8 @@ static int ath9k_init_queues(struct ath9k_htc_priv *priv)
for (i = 0; i < ARRAY_SIZE(priv->hwq_map); i++) for (i = 0; i < ARRAY_SIZE(priv->hwq_map); i++)
priv->hwq_map[i] = -1; priv->hwq_map[i] = -1;
priv->beaconq = ath9k_hw_beaconq_setup(priv->ah); priv->beacon.beaconq = ath9k_hw_beaconq_setup(priv->ah);
if (priv->beaconq == -1) { if (priv->beacon.beaconq == -1) {
ath_err(common, "Unable to setup BEACON xmit queue\n"); ath_err(common, "Unable to setup BEACON xmit queue\n");
goto err; goto err;
} }