diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-08 23:39:28 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-08 23:39:28 +0400 |
| commit | e9a68707d736f4f73d7e209885d7b4c5c452b1dc (patch) | |
| tree | d9f76964c77c1059483b08436ed060b702b8e25d /net/mac80211/debugfs_sta.c | |
| parent | dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44 (diff) | |
| parent | 15a6321d1c0f8db561932cd99e1b9897981da71f (diff) | |
| download | linux-e9a68707d736f4f73d7e209885d7b4c5c452b1dc.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ipw2x00/ipw2200.c
Diffstat (limited to 'net/mac80211/debugfs_sta.c')
| -rw-r--r-- | net/mac80211/debugfs_sta.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index 6b7ff9fb4604..50c40ea3cb4d 100644 --- a/net/mac80211/debugfs_sta.c +++ b/net/mac80211/debugfs_sta.c @@ -196,7 +196,8 @@ static ssize_t sta_agg_status_write(struct file *file, const char __user *userbu else ret = ieee80211_stop_tx_ba_session(&sta->sta, tid); } else { - __ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT, 3); + __ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT, + 3, true); ret = 0; } |