From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 09/11] mac80211: clean up BA session teardown
Date: Thu, 05 Feb 2009 17:07:47 +0100 [thread overview]
Message-ID: <20090205161133.625403535@sipsolutions.net> (raw)
In-Reply-To: 20090205160738.990564487@sipsolutions.net
The sta_info pointer can very well be passed to
ieee80211_sta_tear_down_BA_sessions, this will
later allow us to pass it through even further.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
net/mac80211/ht.c | 8 ++++----
net/mac80211/ieee80211_i.h | 2 +-
net/mac80211/iface.c | 3 +--
net/mac80211/mlme.c | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
--- wireless-testing.orig/net/mac80211/ht.c 2009-01-27 11:51:01.000000000 +0100
+++ wireless-testing/net/mac80211/ht.c 2009-01-27 11:51:38.000000000 +0100
@@ -153,15 +153,15 @@ u32 ieee80211_enable_ht(struct ieee80211
return changed;
}
-void ieee80211_sta_tear_down_BA_sessions(struct ieee80211_sub_if_data *sdata, u8 *addr)
+void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta)
{
- struct ieee80211_local *local = sdata->local;
+ struct ieee80211_local *local = sta->local;
int i;
for (i = 0; i < STA_TID_NUM; i++) {
- ieee80211_stop_tx_ba_session(&local->hw, addr, i,
+ ieee80211_stop_tx_ba_session(&local->hw, sta->sta.addr, i,
WLAN_BACK_INITIATOR);
- ieee80211_sta_stop_rx_ba_session(sdata, addr, i,
+ ieee80211_sta_stop_rx_ba_session(sta->sdata, sta->sta.addr, i,
WLAN_BACK_RECIPIENT,
WLAN_REASON_QSTA_LEAVE_QBSS);
}
--- wireless-testing.orig/net/mac80211/ieee80211_i.h 2009-01-27 11:50:29.000000000 +0100
+++ wireless-testing/net/mac80211/ieee80211_i.h 2009-01-27 11:50:36.000000000 +0100
@@ -988,7 +988,7 @@ void ieee80211_send_delba(struct ieee802
void ieee80211_sta_stop_rx_ba_session(struct ieee80211_sub_if_data *sdata, u8 *da,
u16 tid, u16 initiator, u16 reason);
-void ieee80211_sta_tear_down_BA_sessions(struct ieee80211_sub_if_data *sdata, u8 *addr);
+void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta);
void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta,
struct ieee80211_mgmt *mgmt, size_t len);
--- wireless-testing.orig/net/mac80211/iface.c 2009-01-27 11:50:50.000000000 +0100
+++ wireless-testing/net/mac80211/iface.c 2009-01-27 11:50:58.000000000 +0100
@@ -362,8 +362,7 @@ static int ieee80211_stop(struct net_dev
list_for_each_entry_rcu(sta, &local->sta_list, list) {
if (sta->sdata == sdata)
- ieee80211_sta_tear_down_BA_sessions(sdata,
- sta->sta.addr);
+ ieee80211_sta_tear_down_BA_sessions(sta);
}
rcu_read_unlock();
--- wireless-testing.orig/net/mac80211/mlme.c 2009-01-27 11:50:42.000000000 +0100
+++ wireless-testing/net/mac80211/mlme.c 2009-01-27 11:50:47.000000000 +0100
@@ -913,7 +913,7 @@ static void ieee80211_set_disassoc(struc
netif_tx_stop_all_queues(sdata->dev);
netif_carrier_off(sdata->dev);
- ieee80211_sta_tear_down_BA_sessions(sdata, sta->sta.addr);
+ ieee80211_sta_tear_down_BA_sessions(sta);
if (self_disconnected) {
if (deauth)
--
next prev parent reply other threads:[~2009-02-05 16:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-05 16:07 [PATCH 00/11] mac80211 aggregation cleanups/fixes Johannes Berg
2009-02-05 16:07 ` [PATCH 01/11] mac80211: remove stray aggregation debugfs definition Johannes Berg
2009-02-05 16:07 ` [PATCH 02/11] mac80211: fix RX aggregation timeouts Johannes Berg
2009-02-05 16:07 ` [PATCH 03/11] mac80211: restructure HT code Johannes Berg
2009-02-05 16:07 ` [PATCH 04/11] mac80211: restrict aggregation to supported interface modes Johannes Berg
2009-02-05 16:07 ` [PATCH 05/11] mac80211: hardware should not deny going back to legacy Johannes Berg
2009-02-05 16:07 ` [PATCH 06/11] mac80211: document TX aggregation (and small cleanup) Johannes Berg
2009-02-05 16:07 ` [PATCH 07/11] mac80211: fix race in TX aggregation Johannes Berg
2009-02-06 19:13 ` Luis R. Rodriguez
2009-02-06 20:37 ` Johannes Berg
2009-02-05 16:07 ` [PATCH 08/11] mac80211: fix aggregation timer lockups Johannes Berg
2009-02-05 16:07 ` Johannes Berg [this message]
2009-02-05 16:07 ` [PATCH 10/11] mac80211: RX aggregation: clean up stop session Johannes Berg
2009-02-05 16:07 ` [PATCH 11/11] mac80211: further cleanups to stopping BA sessions Johannes Berg
2009-02-06 22:32 ` [PATCH 00/11] mac80211 aggregation cleanups/fixes Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090205161133.625403535@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).