diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 16:47:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 16:47:16 -0800 |
| commit | 29e553631b2a0d4eebd23db630572e1027a9967a (patch) | |
| tree | a891e02cc245ac9c14dc47528120e262d0298698 /net/mac80211/agg-rx.c | |
| parent | ed9fd93e9a0c327e5d02313ba6e233c8e76da118 (diff) | |
| parent | 827d42c9ac91ddd728e4f4a31fefb906ef2ceff7 (diff) | |
| download | kernel_samsung_smdk4412-29e553631b2a0d4eebd23db630572e1027a9967a.zip kernel_samsung_smdk4412-29e553631b2a0d4eebd23db630572e1027a9967a.tar.gz kernel_samsung_smdk4412-29e553631b2a0d4eebd23db630572e1027a9967a.tar.bz2 | |
Merge branch 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
* 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6:
mac80211: fix spurious delBA handling
mac80211: fix two remote exploits
Diffstat (limited to 'net/mac80211/agg-rx.c')
| -rw-r--r-- | net/mac80211/agg-rx.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c index bc064d7..ce8e0e7 100644 --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c @@ -85,10 +85,6 @@ void ieee80211_sta_stop_rx_ba_session(struct ieee80211_sub_if_data *sdata, u8 *r struct ieee80211_local *local = sdata->local; struct sta_info *sta; - /* stop HW Rx aggregation. ampdu_action existence - * already verified in session init so we add the BUG_ON */ - BUG_ON(!local->ops->ampdu_action); - rcu_read_lock(); sta = sta_info_get(local, ra); |