diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-08-21 16:00:21 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-08-21 16:00:21 -0400 |
commit | 01e17dacd47101ad7d33152bbfbbd4394352d2e6 (patch) | |
tree | d94706b87fcad04d08a46a9b3555396d21ab41ec /drivers/net/wireless/rt2x00 | |
parent | 22c5649eef0fc37532e20c14d2656b28ca708a69 (diff) | |
parent | dcf33963c48e1959c83fda84e336dbb000eefa3f (diff) |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/mac80211_hwsim.c
Diffstat (limited to 'drivers/net/wireless/rt2x00')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.c | 20 |
4 files changed, 18 insertions, 12 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 8afb546c2b2d..f991e8bedc70 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
@@ -1287,7 +1287,9 @@ void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp); | |||
1287 | /* | 1287 | /* |
1288 | * mac80211 handlers. | 1288 | * mac80211 handlers. |
1289 | */ | 1289 | */ |
1290 | void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb); | 1290 | void rt2x00mac_tx(struct ieee80211_hw *hw, |
1291 | struct ieee80211_tx_control *control, | ||
1292 | struct sk_buff *skb); | ||
1291 | int rt2x00mac_start(struct ieee80211_hw *hw); | 1293 | int rt2x00mac_start(struct ieee80211_hw *hw); |
1292 | void rt2x00mac_stop(struct ieee80211_hw *hw); | 1294 | void rt2x00mac_stop(struct ieee80211_hw *hw); |
1293 | int rt2x00mac_add_interface(struct ieee80211_hw *hw, | 1295 | int rt2x00mac_add_interface(struct ieee80211_hw *hw, |
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index a6b88bd4a1a5..a59048ffa092 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
@@ -194,7 +194,7 @@ static void rt2x00lib_bc_buffer_iter(void *data, u8 *mac, | |||
194 | */ | 194 | */ |
195 | skb = ieee80211_get_buffered_bc(rt2x00dev->hw, vif); | 195 | skb = ieee80211_get_buffered_bc(rt2x00dev->hw, vif); |
196 | while (skb) { | 196 | while (skb) { |
197 | rt2x00mac_tx(rt2x00dev->hw, skb); | 197 | rt2x00mac_tx(rt2x00dev->hw, NULL, skb); |
198 | skb = ieee80211_get_buffered_bc(rt2x00dev->hw, vif); | 198 | skb = ieee80211_get_buffered_bc(rt2x00dev->hw, vif); |
199 | } | 199 | } |
200 | } | 200 | } |
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 4ff26c2159bf..c3d0f2f87b69 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
@@ -99,7 +99,9 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev, | |||
99 | return retval; | 99 | return retval; |
100 | } | 100 | } |
101 | 101 | ||
102 | void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 102 | void rt2x00mac_tx(struct ieee80211_hw *hw, |
103 | struct ieee80211_tx_control *control, | ||
104 | struct sk_buff *skb) | ||
103 | { | 105 | { |
104 | struct rt2x00_dev *rt2x00dev = hw->priv; | 106 | struct rt2x00_dev *rt2x00dev = hw->priv; |
105 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 107 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index f7e74a0a7759..e488b944a034 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c | |||
@@ -315,6 +315,7 @@ static void rt2x00queue_create_tx_descriptor_plcp(struct rt2x00_dev *rt2x00dev, | |||
315 | static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, | 315 | static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, |
316 | struct sk_buff *skb, | 316 | struct sk_buff *skb, |
317 | struct txentry_desc *txdesc, | 317 | struct txentry_desc *txdesc, |
318 | struct ieee80211_sta *sta, | ||
318 | const struct rt2x00_rate *hwrate) | 319 | const struct rt2x00_rate *hwrate) |
319 | { | 320 | { |
320 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 321 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
@@ -322,11 +323,11 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, | |||
322 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; | 323 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
323 | struct rt2x00_sta *sta_priv = NULL; | 324 | struct rt2x00_sta *sta_priv = NULL; |
324 | 325 | ||
325 | if (tx_info->control.sta) { | 326 | if (sta) { |
326 | txdesc->u.ht.mpdu_density = | 327 | txdesc->u.ht.mpdu_density = |
327 | tx_info->control.sta->ht_cap.ampdu_density; | 328 | sta->ht_cap.ampdu_density; |
328 | 329 | ||
329 | sta_priv = sta_to_rt2x00_sta(tx_info->control.sta); | 330 | sta_priv = sta_to_rt2x00_sta(sta); |
330 | txdesc->u.ht.wcid = sta_priv->wcid; | 331 | txdesc->u.ht.wcid = sta_priv->wcid; |
331 | } | 332 | } |
332 | 333 | ||
@@ -341,8 +342,8 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, | |||
341 | * MIMO PS should be set to 1 for STA's using dynamic SM PS | 342 | * MIMO PS should be set to 1 for STA's using dynamic SM PS |
342 | * when using more then one tx stream (>MCS7). | 343 | * when using more then one tx stream (>MCS7). |
343 | */ | 344 | */ |
344 | if (tx_info->control.sta && txdesc->u.ht.mcs > 7 && | 345 | if (sta && txdesc->u.ht.mcs > 7 && |
345 | ((tx_info->control.sta->ht_cap.cap & | 346 | ((sta->ht_cap.cap & |
346 | IEEE80211_HT_CAP_SM_PS) >> | 347 | IEEE80211_HT_CAP_SM_PS) >> |
347 | IEEE80211_HT_CAP_SM_PS_SHIFT) == | 348 | IEEE80211_HT_CAP_SM_PS_SHIFT) == |
348 | WLAN_HT_CAP_SM_PS_DYNAMIC) | 349 | WLAN_HT_CAP_SM_PS_DYNAMIC) |
@@ -409,7 +410,8 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, | |||
409 | 410 | ||
410 | static void rt2x00queue_create_tx_descriptor(struct rt2x00_dev *rt2x00dev, | 411 | static void rt2x00queue_create_tx_descriptor(struct rt2x00_dev *rt2x00dev, |
411 | struct sk_buff *skb, | 412 | struct sk_buff *skb, |
412 | struct txentry_desc *txdesc) | 413 | struct txentry_desc *txdesc, |
414 | struct ieee80211_sta *sta) | ||
413 | { | 415 | { |
414 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 416 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
415 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; | 417 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
@@ -503,7 +505,7 @@ static void rt2x00queue_create_tx_descriptor(struct rt2x00_dev *rt2x00dev, | |||
503 | 505 | ||
504 | if (test_bit(REQUIRE_HT_TX_DESC, &rt2x00dev->cap_flags)) | 506 | if (test_bit(REQUIRE_HT_TX_DESC, &rt2x00dev->cap_flags)) |
505 | rt2x00queue_create_tx_descriptor_ht(rt2x00dev, skb, txdesc, | 507 | rt2x00queue_create_tx_descriptor_ht(rt2x00dev, skb, txdesc, |
506 | hwrate); | 508 | sta, hwrate); |
507 | else | 509 | else |
508 | rt2x00queue_create_tx_descriptor_plcp(rt2x00dev, skb, txdesc, | 510 | rt2x00queue_create_tx_descriptor_plcp(rt2x00dev, skb, txdesc, |
509 | hwrate); | 511 | hwrate); |
@@ -595,7 +597,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, | |||
595 | * after that we are free to use the skb->cb array | 597 | * after that we are free to use the skb->cb array |
596 | * for our information. | 598 | * for our information. |
597 | */ | 599 | */ |
598 | rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc); | 600 | rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, NULL); |
599 | 601 | ||
600 | /* | 602 | /* |
601 | * All information is retrieved from the skb->cb array, | 603 | * All information is retrieved from the skb->cb array, |
@@ -740,7 +742,7 @@ int rt2x00queue_update_beacon_locked(struct rt2x00_dev *rt2x00dev, | |||
740 | * after that we are free to use the skb->cb array | 742 | * after that we are free to use the skb->cb array |
741 | * for our information. | 743 | * for our information. |
742 | */ | 744 | */ |
743 | rt2x00queue_create_tx_descriptor(rt2x00dev, intf->beacon->skb, &txdesc); | 745 | rt2x00queue_create_tx_descriptor(rt2x00dev, intf->beacon->skb, &txdesc, NULL); |
744 | 746 | ||
745 | /* | 747 | /* |
746 | * Fill in skb descriptor | 748 | * Fill in skb descriptor |