[Make-wifi-fast] [PATCH v3] mac80211: Move reorder-sensitive TX handlers to after TXQ dequeue.
Noah Causin
n0manletter at gmail.com
Wed Aug 24 18:40:17 EDT 2016
This is what I get when I try building LEDE from the staging branch with
this patch:
Applying ./patches/345-iv-fix.patch using plaintext:
patching file include/net/mac80211.h
patching file net/mac80211/tx.c
Hunk #2 FAILED at 591.
Hunk #3 FAILED at 634.
Hunk #4 succeeded at 801 (offset -4 lines).
Hunk #5 succeeded at 833 (offset -4 lines).
Hunk #6 succeeded at 863 (offset -4 lines).
Hunk #7 FAILED at 947.
Hunk #8 succeeded at 978 (offset -6 lines).
Hunk #9 succeeded at 998 (offset -6 lines).
Hunk #10 succeeded at 1487 (offset -9 lines).
Hunk #11 succeeded at 1553 (offset -9 lines).
Hunk #12 succeeded at 1631 (offset -9 lines).
Hunk #13 succeeded at 1646 (offset -9 lines).
Hunk #14 succeeded at 1766 (offset -9 lines).
Hunk #15 succeeded at 1787 (offset -9 lines).
Hunk #16 succeeded at 1795 (offset -9 lines).
Hunk #17 succeeded at 1843 (offset -9 lines).
Hunk #18 succeeded at 1897 (offset -9 lines).
Hunk #19 succeeded at 1922 (offset -9 lines).
Hunk #20 succeeded at 3322 (offset 22 lines).
Hunk #21 succeeded at 3391 (offset 22 lines).
Hunk #22 succeeded at 3484 (offset 22 lines).
3 out of 22 hunks FAILED -- saving rejects to file net/mac80211/tx.c.rej
patching file net/mac80211/wpa.c
Patch failed! Please fix ./patches/345-iv-fix.patch!
On 8/24/2016 12:20 PM, Toke Høiland-Jørgensen wrote:
> The TXQ intermediate queues can cause packet reordering when more than
> one flow is active to a single station. Since some of the wifi-specific
> packet handling (notably sequence number and encryption handling) is
> sensitive to re-ordering, things break if they are applied before the
> TXQ.
>
> This splits up the TX handlers and fast_xmit logic into two parts: An
> early part and a late part. The former is applied before TXQ enqueue,
> and the latter after dequeue. The non-TXQ path just applies both parts
> at once.
>
> To avoid having to deal with fragmentation on dequeue, the split is set
> to be after the fragmentation handler. This means that some reordering
> of TX handlers is necessary, and some handlers had to be made aware of
> fragmentation due to this reordering.
>
> This approach avoids having to scatter special cases for when TXQ is
> enabled, at the cost of making the fast_xmit and TX handler code
> slightly more complex.
>
> Signed-off-by: Toke Høiland-Jørgensen<toke at toke.dk>
> ---
> Changes since v2:
>
> This is a completely different approach: Instead of adding exceptions
> for TXQ handling, split up the entire TX path in an early and late part,
> and apply the latter after TXQ dequeue. This should fix things that
> don't hit the fast path as well.
>
> I've tested this with both unencrypted traffic and with CCMP and TKIP
> and it appears to fix the previous performance regression seen with
> softq-enabled ath9k. I most likely haven't hit all code paths, though
> (not sure how I would even go about ensuring that), but looks promising
> so far.
>
> include/net/mac80211.h | 2 +
> net/mac80211/tx.c | 276 ++++++++++++++++++++++++++++++++++++++-----------
> net/mac80211/wpa.c | 18 +++-
> 3 files changed, 235 insertions(+), 61 deletions(-)
>
> diff --git a/include/net/mac80211.h b/include/net/mac80211.h
> index cca510a..9a6a3e9 100644
> --- a/include/net/mac80211.h
> +++ b/include/net/mac80211.h
> @@ -715,6 +715,7 @@ enum mac80211_tx_info_flags {
> * frame (PS-Poll or uAPSD).
> * @IEEE80211_TX_CTRL_RATE_INJECT: This frame is injected with rate information
> * @IEEE80211_TX_CTRL_AMSDU: This frame is an A-MSDU frame
> + * @IEEE80211_TX_CTRL_FAST_XMIT: This frame is going through the fast_xmit path
> *
> * These flags are used in tx_info->control.flags.
> */
> @@ -723,6 +724,7 @@ enum mac80211_tx_control_flags {
> IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1),
> IEEE80211_TX_CTRL_RATE_INJECT = BIT(2),
> IEEE80211_TX_CTRL_AMSDU = BIT(3),
> + IEEE80211_TX_CTRL_FAST_XMIT = BIT(4),
> };
>
> /*
> diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
> index 1d0746d..7042d2c 100644
> --- a/net/mac80211/tx.c
> +++ b/net/mac80211/tx.c
> @@ -38,6 +38,12 @@
> #include "wme.h"
> #include "rate.h"
>
> +static int invoke_tx_handlers_late(struct ieee80211_tx_data *tx);
> +static bool ieee80211_xmit_fast_finish(struct ieee80211_sub_if_data *sdata,
> + struct sta_info *sta,
> + struct ieee80211_fast_tx *fast_tx,
> + struct sk_buff *skb, bool xmit);
> +
> /* misc utils */
>
> static inline void ieee80211_tx_stats(struct net_device *dev, u32 len)
> @@ -585,20 +591,27 @@ static ieee80211_tx_result debug_noinline
> ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
> {
> struct ieee80211_key *key;
> - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
> - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
> + struct ieee80211_tx_info *info;
> + struct ieee80211_hdr *hdr;
> + struct sk_buff *skb = tx->skb;
> +
> + if (!skb)
> + skb = skb_peek(&tx->skbs);
> +
> + info = IEEE80211_SKB_CB(skb);
> + hdr = (struct ieee80211_hdr *)skb->data;
>
> if (unlikely(info->flags & IEEE80211_TX_INTFL_DONT_ENCRYPT))
> tx->key = NULL;
> else if (tx->sta &&
> (key = rcu_dereference(tx->sta->ptk[tx->sta->ptk_idx])))
> tx->key = key;
> - else if (ieee80211_is_group_privacy_action(tx->skb) &&
> + else if (ieee80211_is_group_privacy_action(skb) &&
> (key = rcu_dereference(tx->sdata->default_multicast_key)))
> tx->key = key;
> else if (ieee80211_is_mgmt(hdr->frame_control) &&
> is_multicast_ether_addr(hdr->addr1) &&
> - ieee80211_is_robust_mgmt_frame(tx->skb) &&
> + ieee80211_is_robust_mgmt_frame(skb) &&
> (key = rcu_dereference(tx->sdata->default_mgmt_key)))
> tx->key = key;
> else if (is_multicast_ether_addr(hdr->addr1) &&
> @@ -628,8 +641,8 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
> case WLAN_CIPHER_SUITE_GCMP_256:
> if (!ieee80211_is_data_present(hdr->frame_control) &&
> !ieee80211_use_mfp(hdr->frame_control, tx->sta,
> - tx->skb) &&
> - !ieee80211_is_group_privacy_action(tx->skb))
> + skb) &&
> + !ieee80211_is_group_privacy_action(skb))
> tx->key = NULL;
> else
> skip_hw = (tx->key->conf.flags &
> @@ -799,10 +812,12 @@ static __le16 ieee80211_tx_next_seq(struct sta_info *sta, int tid)
> static ieee80211_tx_result debug_noinline
> ieee80211_tx_h_sequence(struct ieee80211_tx_data *tx)
> {
> - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
> - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
> + struct sk_buff *skb = skb_peek(&tx->skbs);
> + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
> + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
> u8 *qc;
> int tid;
> + u16 fragnum, seq;
>
> /*
> * Packet injection may want to control the sequence
> @@ -829,10 +844,16 @@ ieee80211_tx_h_sequence(struct ieee80211_tx_data *tx)
> */
> if (!ieee80211_is_data_qos(hdr->frame_control) ||
> is_multicast_ether_addr(hdr->addr1)) {
> - /* driver should assign sequence number */
> - info->flags |= IEEE80211_TX_CTL_ASSIGN_SEQ;
> - /* for pure STA mode without beacons, we can do it */
> - hdr->seq_ctrl = cpu_to_le16(tx->sdata->sequence_number);
> + fragnum = 0;
> + seq = cpu_to_le16(tx->sdata->sequence_number);
> + skb_queue_walk(&tx->skbs, skb) {
> + info = IEEE80211_SKB_CB(skb);
> + hdr = (struct ieee80211_hdr *)skb->data;
> + /* driver should assign sequence number */
> + info->flags |= IEEE80211_TX_CTL_ASSIGN_SEQ;
> + /* for pure STA mode without beacons, we can do it */
> + hdr->seq_ctrl = seq | fragnum++;
> + }
> tx->sdata->sequence_number += 0x10;
> if (tx->sta)
> tx->sta->tx_stats.msdu[IEEE80211_NUM_TIDS]++;
> @@ -853,8 +874,14 @@ ieee80211_tx_h_sequence(struct ieee80211_tx_data *tx)
> tid = *qc & IEEE80211_QOS_CTL_TID_MASK;
> tx->sta->tx_stats.msdu[tid]++;
>
> - if (!tx->sta->sta.txq[0])
> - hdr->seq_ctrl = ieee80211_tx_next_seq(tx->sta, tid);
> + if (!tx->sta->sta.txq[0]) {
> + seq = ieee80211_tx_next_seq(tx->sta, tid);
> + fragnum = 0;
> + skb_queue_walk(&tx->skbs, skb) {
> + hdr = (struct ieee80211_hdr *)skb->data;
> + hdr->seq_ctrl = seq | fragnum++;
> + }
> + }
>
> return TX_CONTINUE;
> }
> @@ -927,7 +954,6 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx)
> struct ieee80211_hdr *hdr = (void *)skb->data;
> int frag_threshold = tx->local->hw.wiphy->frag_threshold;
> int hdrlen;
> - int fragnum;
>
> /* no matter what happens, tx->skb moves to tx->skbs */
> __skb_queue_tail(&tx->skbs, skb);
> @@ -964,9 +990,6 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx)
> if (ieee80211_fragment(tx, skb, hdrlen, frag_threshold))
> return TX_DROP;
>
> - /* update duration/seq/flags of fragments */
> - fragnum = 0;
> -
> skb_queue_walk(&tx->skbs, skb) {
> const __le16 morefrags = cpu_to_le16(IEEE80211_FCTL_MOREFRAGS);
>
> @@ -987,8 +1010,6 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx)
> } else {
> hdr->frame_control &= ~morefrags;
> }
> - hdr->seq_ctrl |= cpu_to_le16(fragnum & IEEE80211_SCTL_FRAG);
> - fragnum++;
> }
>
> return TX_CONTINUE;
> @@ -1481,33 +1502,59 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,
> {
> struct ieee80211_local *local = hw_to_local(hw);
> struct txq_info *txqi = container_of(txq, struct txq_info, txq);
> - struct ieee80211_hdr *hdr;
> struct sk_buff *skb = NULL;
> struct fq *fq = &local->fq;
> struct fq_tin *tin = &txqi->tin;
> + struct ieee80211_tx_info *info;
>
> spin_lock_bh(&fq->lock);
>
> if (test_bit(IEEE80211_TXQ_STOP, &txqi->flags))
> goto out;
>
> +begin:
> skb = fq_tin_dequeue(fq, tin, fq_tin_dequeue_func);
> if (!skb)
> goto out;
>
> ieee80211_set_skb_vif(skb, txqi);
>
> - hdr = (struct ieee80211_hdr *)skb->data;
> - if (txq->sta && ieee80211_is_data_qos(hdr->frame_control)) {
> + info = IEEE80211_SKB_CB(skb);
> + if (txq->sta && info->control.flags & IEEE80211_TX_CTRL_FAST_XMIT) {
> struct sta_info *sta = container_of(txq->sta, struct sta_info,
> sta);
> - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
> + struct ieee80211_fast_tx *fast_tx;
>
> - hdr->seq_ctrl = ieee80211_tx_next_seq(sta, txq->tid);
> - if (test_bit(IEEE80211_TXQ_AMPDU, &txqi->flags))
> - info->flags |= IEEE80211_TX_CTL_AMPDU;
> - else
> - info->flags &= ~IEEE80211_TX_CTL_AMPDU;
> + fast_tx = rcu_dereference(sta->fast_tx);
> + if (!fast_tx ||
> + !ieee80211_xmit_fast_finish(sta->sdata, sta, fast_tx, skb,
> + false)) {
> + /* fast xmit was started, but fails to finish */
> + ieee80211_free_txskb(hw, skb);
> + goto begin;
> + }
> + } else {
> + struct ieee80211_tx_data tx = { };
> +
> + __skb_queue_head_init(&tx.skbs);
> + tx.local = local;
> + if (txq->sta) {
> + struct sta_info *sta = container_of(txq->sta,
> + struct sta_info,
> + sta);
> + tx.sta = container_of(txq->sta, struct sta_info, sta);
> + tx.sdata = sta->sdata;
> + } else {
> + tx.sdata = container_of(info->control.vif,
> + struct ieee80211_sub_if_data, vif);
> + }
> +
> + __skb_queue_tail(&tx.skbs, skb);
> +
> + if (invoke_tx_handlers_late(&tx))
> + goto begin;
> +
> + __skb_unlink(skb, &tx.skbs);
> }
>
> out:
> @@ -1521,6 +1568,77 @@ out:
> }
> EXPORT_SYMBOL(ieee80211_tx_dequeue);
>
> +static bool ieee80211_queue_skb(struct ieee80211_local *local,
> + struct ieee80211_vif *vif,
> + struct ieee80211_sta *sta,
> + struct sk_buff *skb)
> +{
> + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
> + struct fq *fq = &local->fq;
> + struct txq_info *txqi = ieee80211_get_txq(local, vif, sta, skb);
> +
> + if (!txqi)
> + return false;
> +
> + info->control.vif = vif;
> +
> + spin_lock_bh(&fq->lock);
> + ieee80211_txq_enqueue(local, txqi, skb);
> + spin_unlock_bh(&fq->lock);
> +
> + drv_wake_tx_queue(local, txqi);
> +
> + return true;
> +}
> +
> +static bool ieee80211_queue_frags(struct ieee80211_local *local,
> + struct sta_info *sta,
> + struct sk_buff_head *skbs)
> +{
> + struct txq_info *txqi;
> + struct sk_buff *skb, *tmp;
> + struct ieee80211_tx_info *info;
> + struct ieee80211_sub_if_data *sdata;
> + struct ieee80211_vif *vif;
> + struct ieee80211_sta *pubsta;
> +
> + if (WARN_ON(skb_queue_empty(skbs)))
> + return true;
> +
> + skb = skb_peek(skbs);
> + info = IEEE80211_SKB_CB(skb);
> + sdata = vif_to_sdata(info->control.vif);
> + if (sta && !sta->uploaded)
> + sta = NULL;
> +
> + if (sta)
> + pubsta = &sta->sta;
> + else
> + pubsta = NULL;
> +
> + switch (sdata->vif.type) {
> + case NL80211_IFTYPE_MONITOR:
> + return false;
> + case NL80211_IFTYPE_AP_VLAN:
> + sdata = container_of(sdata->bss,
> + struct ieee80211_sub_if_data, u.ap);
> + /* fall through */
> + default:
> + vif = &sdata->vif;
> + break;
> + }
> +
> + skb_queue_walk_safe(skbs, skb, tmp) {
> + txqi = ieee80211_get_txq(local, vif, pubsta, skb);
> + if (txqi) {
> + __skb_unlink(skb, skbs);
> + ieee80211_queue_skb(local, vif, pubsta, skb);
> + }
> + }
> +
> + return !!skb_queue_empty(skbs);
> +}
> +
> static bool ieee80211_tx_frags(struct ieee80211_local *local,
> struct ieee80211_vif *vif,
> struct ieee80211_sta *sta,
> @@ -1528,9 +1646,7 @@ static bool ieee80211_tx_frags(struct ieee80211_local *local,
> bool txpending)
> {
> struct ieee80211_tx_control control = {};
> - struct fq *fq = &local->fq;
> struct sk_buff *skb, *tmp;
> - struct txq_info *txqi;
> unsigned long flags;
>
> skb_queue_walk_safe(skbs, skb, tmp) {
> @@ -1545,21 +1661,6 @@ static bool ieee80211_tx_frags(struct ieee80211_local *local,
> }
> #endif
>
> - txqi = ieee80211_get_txq(local, vif, sta, skb);
> - if (txqi) {
> - info->control.vif = vif;
> -
> - __skb_unlink(skb, skbs);
> -
> - spin_lock_bh(&fq->lock);
> - ieee80211_txq_enqueue(local, txqi, skb);
> - spin_unlock_bh(&fq->lock);
> -
> - drv_wake_tx_queue(local, txqi);
> -
> - continue;
> - }
> -
> spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
> if (local->queue_stop_reasons[q] ||
> (!txpending && !skb_queue_empty(&local->pending[q]))) {
> @@ -1680,8 +1781,12 @@ static bool __ieee80211_tx(struct ieee80211_local *local,
> /*
> * Invoke TX handlers, return 0 on success and non-zero if the
> * frame was dropped or queued.
> + *
> + * The handlers are split into an early and late part. The latter is everything
> + * that can be sensitive to reordering, and will be deferred to after packets
> + * are dequeued from the intermediate queues (when they are enabled).
> */
> -static int invoke_tx_handlers(struct ieee80211_tx_data *tx)
> +static int invoke_tx_handlers_early(struct ieee80211_tx_data *tx)
> {
> struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
> ieee80211_tx_result res = TX_DROP;
> @@ -1697,7 +1802,6 @@ static int invoke_tx_handlers(struct ieee80211_tx_data *tx)
> CALL_TXH(ieee80211_tx_h_check_assoc);
> CALL_TXH(ieee80211_tx_h_ps_buf);
> CALL_TXH(ieee80211_tx_h_check_control_port_protocol);
> - CALL_TXH(ieee80211_tx_h_select_key);
> if (!ieee80211_hw_check(&tx->local->hw, HAS_RATE_CONTROL))
> CALL_TXH(ieee80211_tx_h_rate_ctrl);
>
> @@ -1706,11 +1810,32 @@ static int invoke_tx_handlers(struct ieee80211_tx_data *tx)
> tx->skb = NULL;
> goto txh_done;
> }
> + CALL_TXH(ieee80211_tx_h_fragment);
> +
> + txh_done:
> + if (unlikely(res == TX_DROP)) {
> + I802_DEBUG_INC(tx->local->tx_handlers_drop);
> + if (tx->skb)
> + ieee80211_free_txskb(&tx->local->hw, tx->skb);
> + else
> + ieee80211_purge_tx_queue(&tx->local->hw, &tx->skbs);
> + return -1;
> + } else if (unlikely(res == TX_QUEUED)) {
> + I802_DEBUG_INC(tx->local->tx_handlers_queued);
> + return -1;
> + }
>
> + return 0;
> +}
> +
> +static int invoke_tx_handlers_late(struct ieee80211_tx_data *tx)
> +{
> + ieee80211_tx_result res = TX_DROP;
> +
> + /* late tx handlers must be aware of tx info fragmentation! */
> + CALL_TXH(ieee80211_tx_h_select_key);
> CALL_TXH(ieee80211_tx_h_michael_mic_add);
> CALL_TXH(ieee80211_tx_h_sequence);
> - CALL_TXH(ieee80211_tx_h_fragment);
> - /* handlers after fragment must be aware of tx info fragmentation! */
> CALL_TXH(ieee80211_tx_h_stats);
> CALL_TXH(ieee80211_tx_h_encrypt);
> if (!ieee80211_hw_check(&tx->local->hw, HAS_RATE_CONTROL))
> @@ -1733,6 +1858,11 @@ static int invoke_tx_handlers(struct ieee80211_tx_data *tx)
> return 0;
> }
>
> +static int invoke_tx_handlers(struct ieee80211_tx_data *tx)
> +{
> + return invoke_tx_handlers_early(tx) || invoke_tx_handlers_late(tx);
> +}
> +
> bool ieee80211_tx_prepare_skb(struct ieee80211_hw *hw,
> struct ieee80211_vif *vif, struct sk_buff *skb,
> int band, struct ieee80211_sta **sta)
> @@ -1782,7 +1912,7 @@ static bool ieee80211_tx(struct ieee80211_sub_if_data *sdata,
> struct ieee80211_tx_data tx;
> ieee80211_tx_result res_prepare;
> struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
> - bool result = true;
> + bool result = true, queue = !!(local->ops->wake_tx_queue);
> int led_len;
>
> if (unlikely(skb->len < 10)) {
> @@ -1807,7 +1937,13 @@ static bool ieee80211_tx(struct ieee80211_sub_if_data *sdata,
> info->hw_queue =
> sdata->vif.hw_queue[skb_get_queue_mapping(skb)];
>
> - if (!invoke_tx_handlers(&tx))
> + if (invoke_tx_handlers_early(&tx))
> + return false;
> +
> + if (queue && ieee80211_queue_frags(local, tx.sta, &tx.skbs))
> + return true;
> +
> + if (!invoke_tx_handlers_late(&tx))
> result = __ieee80211_tx(local, &tx.skbs, led_len,
> tx.sta, txpending);
>
> @@ -3170,10 +3306,9 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,
> struct ethhdr eth;
> struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
> struct ieee80211_hdr *hdr = (void *)fast_tx->hdr;
> - struct ieee80211_tx_data tx;
> - ieee80211_tx_result r;
> struct tid_ampdu_tx *tid_tx = NULL;
> u8 tid = IEEE80211_NUM_TIDS;
> + bool queue = !!(local->ops->wake_tx_queue);
>
> /* control port protocol needs a lot of special handling */
> if (cpu_to_be16(ethertype) == sdata->control_port_protocol)
> @@ -3240,8 +3375,32 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,
> info->flags = IEEE80211_TX_CTL_FIRST_FRAGMENT |
> IEEE80211_TX_CTL_DONTFRAG |
> (tid_tx ? IEEE80211_TX_CTL_AMPDU : 0);
> + info->control.flags = IEEE80211_TX_CTRL_FAST_XMIT;
> +
> + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
> + sdata = container_of(sdata->bss,
> + struct ieee80211_sub_if_data, u.ap);
> +
> + if (queue && ieee80211_queue_skb(local, &sdata->vif, &sta->sta, skb))
> + return true;
> +
> + return ieee80211_xmit_fast_finish(sdata, sta, fast_tx, skb, true);
> +}
> +
> +static bool ieee80211_xmit_fast_finish(struct ieee80211_sub_if_data *sdata,
> + struct sta_info *sta,
> + struct ieee80211_fast_tx *fast_tx,
> + struct sk_buff *skb, bool xmit)
> +{
> + struct ieee80211_local *local = sdata->local;
> + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
> + struct ieee80211_hdr *hdr = (void *)fast_tx->hdr;
> + struct ieee80211_tx_data tx;
> + ieee80211_tx_result r;
> + u8 tid = IEEE80211_NUM_TIDS;
>
> if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) {
> + tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;
> *ieee80211_get_qos_ctl(hdr) = tid;
> if (!sta->sta.txq[0])
> hdr->seq_ctrl = ieee80211_tx_next_seq(sta, tid);
> @@ -3309,12 +3468,11 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,
> }
> }
>
> - if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
> - sdata = container_of(sdata->bss,
> - struct ieee80211_sub_if_data, u.ap);
> + if (xmit) {
> + __skb_queue_tail(&tx.skbs, skb);
> + ieee80211_tx_frags(local, &sdata->vif, &sta->sta, &tx.skbs, false);
> + }
>
> - __skb_queue_tail(&tx.skbs, skb);
> - ieee80211_tx_frags(local, &sdata->vif, &sta->sta, &tx.skbs, false);
> return true;
> }
>
> diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
> index b48c1e1..71c479a 100644
> --- a/net/mac80211/wpa.c
> +++ b/net/mac80211/wpa.c
> @@ -28,13 +28,13 @@
> #include "wpa.h"
>
> ieee80211_tx_result
> -ieee80211_tx_h_michael_mic_add(struct ieee80211_tx_data *tx)
> +ieee80211_tx_h_michael_mic_add_skb(struct ieee80211_tx_data *tx,
> + struct sk_buff *skb)
> {
> u8 *data, *key, *mic;
> size_t data_len;
> unsigned int hdrlen;
> struct ieee80211_hdr *hdr;
> - struct sk_buff *skb = tx->skb;
> struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
> int tail;
>
> @@ -83,6 +83,20 @@ ieee80211_tx_h_michael_mic_add(struct ieee80211_tx_data *tx)
> return TX_CONTINUE;
> }
>
> +ieee80211_tx_result
> +ieee80211_tx_h_michael_mic_add(struct ieee80211_tx_data *tx)
> +{
> + struct sk_buff *skb;
> + ieee80211_tx_result r;
> +
> + skb_queue_walk(&tx->skbs, skb) {
> + r = ieee80211_tx_h_michael_mic_add_skb(tx, skb);
> + if (r != TX_CONTINUE)
> + return r;
> + }
> + return TX_CONTINUE;
> +}
> +
>
> ieee80211_rx_result
> ieee80211_rx_h_michael_mic_verify(struct ieee80211_rx_data *rx)
> -- 2.9.3 _______________________________________________
> Make-wifi-fast mailing list Make-wifi-fast at lists.bufferbloat.net
> https://lists.bufferbloat.net/listinfo/make-wifi-fast
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.bufferbloat.net/pipermail/make-wifi-fast/attachments/20160824/61e2907b/attachment-0001.html>
More information about the Make-wifi-fast
mailing list