diff options
| author |  John W. Linville <linville@tuxdriver.com>
| 2012-12-11 16:04:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com>
| 2012-12-11 16:04:03 -0500 |
| commit | c66cfd5325bb215a251f4685fac8718b1da33197 (patch) | |
| tree | 7c8ed5289c4a99ffcd2588ac48b5a512312a375b /net/mac80211/status.c | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw... (diff) | |
| parent | minstrel: update stats after processing status (diff) | |
| download | linux-c66cfd5325bb215a251f4685fac8718b1da33197.tar.gz linux-c66cfd5325bb215a251f4685fac8718b1da33197.tar.bz2 linux-c66cfd5325bb215a251f4685fac8718b1da33197.zip | |
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
Diffstat (limited to 'net/mac80211/status.c')
| -rw-r--r-- | net/mac80211/status.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index ab50285fcbab..07d99578a2b1 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -502,7 +502,11 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) IEEE80211_BAR_CTRL_TID_INFO_MASK) >> IEEE80211_BAR_CTRL_TID_INFO_SHIFT; - ieee80211_set_bar_pending(sta, tid, ssn); + if (local->hw.flags & + IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL) + ieee80211_stop_tx_ba_session(&sta->sta, tid); + else + ieee80211_set_bar_pending(sta, tid, ssn); } } |