Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 44738
-@@ -321,11 +328,23 @@ struct sta_info *sta_info_alloc(struct i
+@@ -321,11 +328,25 @@ struct sta_info *sta_info_alloc(struct i
for (i = 0; i < ARRAY_SIZE(sta->chain_signal_avg); i++)
ewma_init(&sta->chain_signal_avg[i], 1024, 8);
for (i = 0; i < ARRAY_SIZE(sta->chain_signal_avg); i++)
ewma_init(&sta->chain_signal_avg[i], 1024, 8);
- kfree(sta);
- return NULL;
+ if (local->ops->wake_tx_queue) {
- kfree(sta);
- return NULL;
+ if (local->ops->wake_tx_queue) {
+ int size = sizeof(struct txq_info) +
+ ALIGN(hw->txq_data_size, sizeof(void *));
+
+ int size = sizeof(struct txq_info) +
+ ALIGN(hw->txq_data_size, sizeof(void *));
+
-+ sta->txq = kcalloc(IEEE80211_NUM_TIDS, size, gfp);
-+ if (!sta->txq)
++ txq_data = kcalloc(IEEE80211_NUM_TIDS, size, gfp);
++ if (!txq_data)
+ for (i = 0; i < IEEE80211_NUM_TIDS; i++) {
+ for (i = 0; i < IEEE80211_NUM_TIDS; i++) {
-+ struct txq_info *txq = sta->txq + i * size;
++ struct txq_info *txq = txq_data + i * size;
+ ieee80211_init_tx_queue(sdata, sta, txq, i);
+ }
}
+ ieee80211_init_tx_queue(sdata, sta, txq, i);
+ }
}
for (i = 0; i < IEEE80211_NUM_TIDS; i++) {
/*
* timer_to_tid must be initialized with identity mapping
for (i = 0; i < IEEE80211_NUM_TIDS; i++) {
/*
* timer_to_tid must be initialized with identity mapping
-@@ -346,7 +365,7 @@ struct sta_info *sta_info_alloc(struct i
+@@ -346,7 +367,7 @@ struct sta_info *sta_info_alloc(struct i
if (sdata->vif.type == NL80211_IFTYPE_AP ||
sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
struct ieee80211_supported_band *sband =
if (sdata->vif.type == NL80211_IFTYPE_AP ||
sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
struct ieee80211_supported_band *sband =
u8 smps = (sband->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >>
IEEE80211_HT_CAP_SM_PS_SHIFT;
/*
u8 smps = (sband->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >>
IEEE80211_HT_CAP_SM_PS_SHIFT;
/*
-@@ -371,6 +390,12 @@ struct sta_info *sta_info_alloc(struct i
+@@ -371,6 +392,12 @@ struct sta_info *sta_info_alloc(struct i
sta_dbg(sdata, "Allocated STA %pM\n", sta->sta.addr);
return sta;
sta_dbg(sdata, "Allocated STA %pM\n", sta->sta.addr);
return sta;