|
@@ -1243,7 +1243,7 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
|
|
|
|
|
|
static struct txq_info *ieee80211_get_txq(struct ieee80211_local *local,
|
|
|
struct ieee80211_vif *vif,
|
|
|
- struct ieee80211_sta *pubsta,
|
|
|
+ struct sta_info *sta,
|
|
|
struct sk_buff *skb)
|
|
|
{
|
|
|
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
|
|
@@ -1257,10 +1257,13 @@ static struct txq_info *ieee80211_get_txq(struct ieee80211_local *local,
|
|
|
if (!ieee80211_is_data(hdr->frame_control))
|
|
|
return NULL;
|
|
|
|
|
|
- if (pubsta) {
|
|
|
+ if (sta) {
|
|
|
u8 tid = skb->priority & IEEE80211_QOS_CTL_TID_MASK;
|
|
|
|
|
|
- txq = pubsta->txq[tid];
|
|
|
+ if (!sta->uploaded)
|
|
|
+ return NULL;
|
|
|
+
|
|
|
+ txq = sta->sta.txq[tid];
|
|
|
} else if (vif) {
|
|
|
txq = vif->txq;
|
|
|
}
|
|
@@ -1503,23 +1506,17 @@ static bool ieee80211_queue_skb(struct ieee80211_local *local,
|
|
|
struct fq *fq = &local->fq;
|
|
|
struct ieee80211_vif *vif;
|
|
|
struct txq_info *txqi;
|
|
|
- struct ieee80211_sta *pubsta;
|
|
|
|
|
|
if (!local->ops->wake_tx_queue ||
|
|
|
sdata->vif.type == NL80211_IFTYPE_MONITOR)
|
|
|
return false;
|
|
|
|
|
|
- if (sta && sta->uploaded)
|
|
|
- pubsta = &sta->sta;
|
|
|
- else
|
|
|
- pubsta = NULL;
|
|
|
-
|
|
|
if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
|
|
|
sdata = container_of(sdata->bss,
|
|
|
struct ieee80211_sub_if_data, u.ap);
|
|
|
|
|
|
vif = &sdata->vif;
|
|
|
- txqi = ieee80211_get_txq(local, vif, pubsta, skb);
|
|
|
+ txqi = ieee80211_get_txq(local, vif, sta, skb);
|
|
|
|
|
|
if (!txqi)
|
|
|
return false;
|