diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
| commit | ff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch) | |
| tree | 93bd6152d9fa28348be99ef1c788040cc7b7a94d /net/mac80211/agg-rx.c | |
| parent | 65c0cfafce9575319fb6f70080fbe226e5617e3b (diff) | |
| parent | b2722b1c3a893ec6021508da15b32282ec79f4da (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/ht.c
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 614c65d62ae4..51c7dc3c4c3b 100644 --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c | |||
| @@ -86,10 +86,6 @@ void ieee80211_sta_stop_rx_ba_session(struct ieee80211_sub_if_data *sdata, u8 *r | |||
| 86 | struct ieee80211_local *local = sdata->local; | 86 | struct ieee80211_local *local = sdata->local; |
| 87 | struct sta_info *sta; | 87 | struct sta_info *sta; |
| 88 | 88 | ||
| 89 | /* stop HW Rx aggregation. ampdu_action existence | ||
| 90 | * already verified in session init so we add the BUG_ON */ | ||
| 91 | BUG_ON(!local->ops->ampdu_action); | ||
| 92 | |||
| 93 | rcu_read_lock(); | 89 | rcu_read_lock(); |
| 94 | 90 | ||
| 95 | sta = sta_info_get(local, ra); | 91 | sta = sta_info_get(local, ra); |