diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-09-19 15:00:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-19 15:00:16 -0400 |
| commit | b53d63ecce17c4ddf8636def9f6e8b865c3927f9 (patch) | |
| tree | 683ef774fcfb423fa35f61e4326d0ce3f6a7c283 /drivers/net/wireless/rt2x00/rt2x00queue.c | |
| parent | 765cf9976e937f1cfe9159bf4534967c8bf8eb6d (diff) | |
| parent | 12e62d6f7ec475e546b40bece2045da15d6c21ef (diff) | |
| download | olio-linux-3.10-b53d63ecce17c4ddf8636def9f6e8b865c3927f9.tar.xz olio-linux-3.10-b53d63ecce17c4ddf8636def9f6e8b865c3927f9.zip | |
Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00queue.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index 29edb9fbe6f..5adfb3eab9c 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c @@ -310,11 +310,16 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0]; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; + struct rt2x00_sta *sta_priv = NULL; - if (tx_info->control.sta) + if (tx_info->control.sta) { txdesc->u.ht.mpdu_density = tx_info->control.sta->ht_cap.ampdu_density; + sta_priv = sta_to_rt2x00_sta(tx_info->control.sta); + txdesc->u.ht.wcid = sta_priv->wcid; + } + txdesc->u.ht.ba_size = 7; /* FIXME: What value is needed? */ /* |