diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2013-10-31 06:23:57 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-11-11 14:38:59 -0500 |
commit | 3d8bfe141be8e5c21261fc63da8e7964d44f2645 (patch) | |
tree | bf5a3ede1705921c8c1084fe54d4ed42f65b3c1d /drivers/net/wireless/rt2x00/rt2x00queue.c | |
parent | 7777bd458e9e7cf9ac604f22e5b1691628b45c66 (diff) |
rt2x00: fix HT TX descriptor settings regression
Since:
commit 36323f817af0376c78612cfdab714b0feb05fea5
Author: Thomas Huehn <thomas@net.t-labs.tu-berlin.de>
Date: Mon Jul 23 21:33:42 2012 +0200
mac80211: move TX station pointer and restructure TX
we do not pass sta pointer to rt2x00queue_create_tx_descriptor_ht(),
hence we do not correctly set station WCID and AMPDU density parameters.
Cc: stable@vger.kernel.org # 3.7+
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00queue.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index 50590b1420a5..a5d38e8ad9e4 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c | |||
@@ -635,7 +635,7 @@ static void rt2x00queue_bar_check(struct queue_entry *entry) | |||
635 | } | 635 | } |
636 | 636 | ||
637 | int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, | 637 | int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, |
638 | bool local) | 638 | struct ieee80211_sta *sta, bool local) |
639 | { | 639 | { |
640 | struct ieee80211_tx_info *tx_info; | 640 | struct ieee80211_tx_info *tx_info; |
641 | struct queue_entry *entry; | 641 | struct queue_entry *entry; |
@@ -649,7 +649,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, | |||
649 | * after that we are free to use the skb->cb array | 649 | * after that we are free to use the skb->cb array |
650 | * for our information. | 650 | * for our information. |
651 | */ | 651 | */ |
652 | rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, NULL); | 652 | rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, sta); |
653 | 653 | ||
654 | /* | 654 | /* |
655 | * All information is retrieved from the skb->cb array, | 655 | * All information is retrieved from the skb->cb array, |