openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rt2x00: fix HT TX descriptor settings regression 

Since:

commit 36323f817a
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>
This commit is contained in:
Stanislaw Gruszka 2013-10-31 11:23:57 +01:00 committed by John W. Linville
parent 7777bd458e
commit 3d8bfe141b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/rt2x00/rt2x00lib.h
View File

@ -146,7 +146,7 @@ void rt2x00queue_remove_l2pad(struct sk_buff *skb, unsigned int header_length);
* @local: frame is not from mac80211 * @local: frame is not from mac80211
*/ */
int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
bool local); struct ieee80211_sta *sta, bool local);
/** /**
* rt2x00queue_update_beacon - Send new beacon from mac80211 * rt2x00queue_update_beacon - Send new beacon from mac80211

4
drivers/net/wireless/rt2x00/rt2x00mac.c
View File

@ -90,7 +90,7 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,
frag_skb->data, data_length, tx_info, frag_skb->data, data_length, tx_info,
(struct ieee80211_rts *)(skb->data)); (struct ieee80211_rts *)(skb->data));
retval = rt2x00queue_write_tx_frame(queue, skb, true); retval = rt2x00queue_write_tx_frame(queue, skb, NULL, true);
if (retval) { if (retval) {
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
rt2x00_warn(rt2x00dev, "Failed to send RTS/CTS frame\n"); rt2x00_warn(rt2x00dev, "Failed to send RTS/CTS frame\n");
@ -151,7 +151,7 @@ void rt2x00mac_tx(struct ieee80211_hw *hw,
goto exit_fail; goto exit_fail;
} }
if (unlikely(rt2x00queue_write_tx_frame(queue, skb, false))) if (unlikely(rt2x00queue_write_tx_frame(queue, skb, control->sta, false)))
goto exit_fail; goto exit_fail;
/* /*

4
drivers/net/wireless/rt2x00/rt2x00queue.c
View File

@ -635,7 +635,7 @@ static void rt2x00queue_bar_check(struct queue_entry *entry)
} }
int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
bool local) struct ieee80211_sta *sta, bool local)
{ {
struct ieee80211_tx_info *tx_info; struct ieee80211_tx_info *tx_info;
struct queue_entry *entry; struct queue_entry *entry;
@ -649,7 +649,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
* after that we are free to use the skb->cb array * after that we are free to use the skb->cb array
* for our information. * for our information.
*/ */
rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, NULL); rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, sta);
/* /*
* All information is retrieved from the skb->cb array, * All information is retrieved from the skb->cb array,