diff options
author | Ron Rindjunsky <ron.rindjunsky@intel.com> | 2008-07-01 07:16:03 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-07-08 10:21:34 -0400 |
commit | 429a380571a6e6b8525b93161544eafc9b227e44 (patch) | |
tree | a90ad1cba6ea557ace90a74ea02af9d5bcad36c1 /net/mac80211/main.c | |
parent | b2898a27809f54a33050a70d0eaa4a78194163a0 (diff) |
mac80211: add block ack request capability
This patch adds block ack request capability
Signed-off-by: Ester Kummer <ester.kummer@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index f18cfd727872..074f71a62a6d 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
@@ -1404,14 +1404,15 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
1404 | struct ieee80211_local *local = hw_to_local(hw); | 1404 | struct ieee80211_local *local = hw_to_local(hw); |
1405 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 1405 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
1406 | u16 frag, type; | 1406 | u16 frag, type; |
1407 | __le16 fc; | ||
1407 | struct ieee80211_tx_status_rtap_hdr *rthdr; | 1408 | struct ieee80211_tx_status_rtap_hdr *rthdr; |
1408 | struct ieee80211_sub_if_data *sdata; | 1409 | struct ieee80211_sub_if_data *sdata; |
1409 | struct net_device *prev_dev = NULL; | 1410 | struct net_device *prev_dev = NULL; |
1411 | struct sta_info *sta; | ||
1410 | 1412 | ||
1411 | rcu_read_lock(); | 1413 | rcu_read_lock(); |
1412 | 1414 | ||
1413 | if (info->status.excessive_retries) { | 1415 | if (info->status.excessive_retries) { |
1414 | struct sta_info *sta; | ||
1415 | sta = sta_info_get(local, hdr->addr1); | 1416 | sta = sta_info_get(local, hdr->addr1); |
1416 | if (sta) { | 1417 | if (sta) { |
1417 | if (test_sta_flags(sta, WLAN_STA_PS)) { | 1418 | if (test_sta_flags(sta, WLAN_STA_PS)) { |
@@ -1426,8 +1427,24 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
1426 | } | 1427 | } |
1427 | } | 1428 | } |
1428 | 1429 | ||
1430 | fc = hdr->frame_control; | ||
1431 | |||
1432 | if ((info->flags & IEEE80211_TX_STAT_AMPDU_NO_BACK) && | ||
1433 | (ieee80211_is_data_qos(fc))) { | ||
1434 | u16 tid, ssn; | ||
1435 | u8 *qc; | ||
1436 | sta = sta_info_get(local, hdr->addr1); | ||
1437 | if (sta) { | ||
1438 | qc = ieee80211_get_qos_ctl(hdr); | ||
1439 | tid = qc[0] & 0xf; | ||
1440 | ssn = ((le16_to_cpu(hdr->seq_ctrl) + 0x10) | ||
1441 | & IEEE80211_SCTL_SEQ); | ||
1442 | ieee80211_send_bar(sta->sdata->dev, hdr->addr1, | ||
1443 | tid, ssn); | ||
1444 | } | ||
1445 | } | ||
1446 | |||
1429 | if (info->flags & IEEE80211_TX_STAT_TX_FILTERED) { | 1447 | if (info->flags & IEEE80211_TX_STAT_TX_FILTERED) { |
1430 | struct sta_info *sta; | ||
1431 | sta = sta_info_get(local, hdr->addr1); | 1448 | sta = sta_info_get(local, hdr->addr1); |
1432 | if (sta) { | 1449 | if (sta) { |
1433 | ieee80211_handle_filtered_frame(local, sta, skb); | 1450 | ieee80211_handle_filtered_frame(local, sta, skb); |