aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/agg-tx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-05-27 08:41:07 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-06-03 14:10:45 -0400
commit6a8579d0e62c0eac428184ce45e86bc46677724a (patch)
tree192d3adc84985598ad6006df43d246adce002f7e /net/mac80211/agg-tx.c
parent2b2c009ecf71f4c66ff8420b63dddbc9737e04e3 (diff)
mac80211: clean up ieee80211_stop_tx_ba_session
There's no sense in letting anything but internal mac80211 functions set the initiator to anything but WLAN_BACK_INITIATOR, since WLAN_BACK_RECIPIENT is only valid when we have received a frame from the peer, which we react to directly in mac80211. The debugfs code I recently added got this wrong as well. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/agg-tx.c')
-rw-r--r--net/mac80211/agg-tx.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index c163d0a149f4..feb15c4a1fad 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -538,14 +538,13 @@ int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
538 return ret; 538 return ret;
539} 539}
540 540
541int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, 541int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)
542 enum ieee80211_back_parties initiator)
543{ 542{
544 struct sta_info *sta = container_of(pubsta, struct sta_info, sta); 543 struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
545 struct ieee80211_sub_if_data *sdata = sta->sdata; 544 struct ieee80211_sub_if_data *sdata = sta->sdata;
546 struct ieee80211_local *local = sdata->local; 545 struct ieee80211_local *local = sdata->local;
547 546
548 trace_api_stop_tx_ba_session(pubsta, tid, initiator); 547 trace_api_stop_tx_ba_session(pubsta, tid);
549 548
550 if (!local->ops->ampdu_action) 549 if (!local->ops->ampdu_action)
551 return -EINVAL; 550 return -EINVAL;
@@ -553,7 +552,7 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
553 if (tid >= STA_TID_NUM) 552 if (tid >= STA_TID_NUM)
554 return -EINVAL; 553 return -EINVAL;
555 554
556 return __ieee80211_stop_tx_ba_session(sta, tid, initiator); 555 return __ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_INITIATOR);
557} 556}
558EXPORT_SYMBOL(ieee80211_stop_tx_ba_session); 557EXPORT_SYMBOL(ieee80211_stop_tx_ba_session);
559 558