mac80211: move BA session work
Move the block-ack session works into common code, since it will be needed for RX agg too in the next patches. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
0ab337032a
commit
67c282c00c
4 changed files with 40 additions and 38 deletions
|
@ -133,9 +133,8 @@ static void kfree_tid_tx(struct rcu_head *rcu_head)
|
|||
kfree(tid_tx);
|
||||
}
|
||||
|
||||
static int ___ieee80211_stop_tx_ba_session(
|
||||
struct sta_info *sta, u16 tid,
|
||||
enum ieee80211_back_parties initiator)
|
||||
int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
|
||||
enum ieee80211_back_parties initiator)
|
||||
{
|
||||
struct ieee80211_local *local = sta->local;
|
||||
struct tid_ampdu_tx *tid_tx = sta->ampdu_mlme.tid_tx[tid];
|
||||
|
@ -262,7 +261,7 @@ ieee80211_wake_queue_agg(struct ieee80211_local *local, int tid)
|
|||
__release(agg_queue);
|
||||
}
|
||||
|
||||
static void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
|
||||
void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
|
||||
{
|
||||
struct tid_ampdu_tx *tid_tx = sta->ampdu_mlme.tid_tx[tid];
|
||||
struct ieee80211_local *local = sta->local;
|
||||
|
@ -318,38 +317,6 @@ static void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
|
|||
0x40, 5000);
|
||||
}
|
||||
|
||||
void ieee80211_tx_ba_session_work(struct work_struct *work)
|
||||
{
|
||||
struct sta_info *sta =
|
||||
container_of(work, struct sta_info, ampdu_mlme.work);
|
||||
struct tid_ampdu_tx *tid_tx;
|
||||
int tid;
|
||||
|
||||
/*
|
||||
* When this flag is set, new sessions should be
|
||||
* blocked, and existing sessions will be torn
|
||||
* down by the code that set the flag, so this
|
||||
* need not run.
|
||||
*/
|
||||
if (test_sta_flags(sta, WLAN_STA_BLOCK_BA))
|
||||
return;
|
||||
|
||||
spin_lock_bh(&sta->lock);
|
||||
for (tid = 0; tid < STA_TID_NUM; tid++) {
|
||||
tid_tx = sta->ampdu_mlme.tid_tx[tid];
|
||||
if (!tid_tx)
|
||||
continue;
|
||||
|
||||
if (test_bit(HT_AGG_STATE_WANT_START, &tid_tx->state))
|
||||
ieee80211_tx_ba_session_handle_start(sta, tid);
|
||||
else if (test_and_clear_bit(HT_AGG_STATE_WANT_STOP,
|
||||
&tid_tx->state))
|
||||
___ieee80211_stop_tx_ba_session(sta, tid,
|
||||
WLAN_BACK_INITIATOR);
|
||||
}
|
||||
spin_unlock_bh(&sta->lock);
|
||||
}
|
||||
|
||||
int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)
|
||||
{
|
||||
struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
|
||||
|
|
|
@ -114,6 +114,38 @@ void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta)
|
|||
}
|
||||
}
|
||||
|
||||
void ieee80211_ba_session_work(struct work_struct *work)
|
||||
{
|
||||
struct sta_info *sta =
|
||||
container_of(work, struct sta_info, ampdu_mlme.work);
|
||||
struct tid_ampdu_tx *tid_tx;
|
||||
int tid;
|
||||
|
||||
/*
|
||||
* When this flag is set, new sessions should be
|
||||
* blocked, and existing sessions will be torn
|
||||
* down by the code that set the flag, so this
|
||||
* need not run.
|
||||
*/
|
||||
if (test_sta_flags(sta, WLAN_STA_BLOCK_BA))
|
||||
return;
|
||||
|
||||
spin_lock_bh(&sta->lock);
|
||||
for (tid = 0; tid < STA_TID_NUM; tid++) {
|
||||
tid_tx = sta->ampdu_mlme.tid_tx[tid];
|
||||
if (!tid_tx)
|
||||
continue;
|
||||
|
||||
if (test_bit(HT_AGG_STATE_WANT_START, &tid_tx->state))
|
||||
ieee80211_tx_ba_session_handle_start(sta, tid);
|
||||
else if (test_and_clear_bit(HT_AGG_STATE_WANT_STOP,
|
||||
&tid_tx->state))
|
||||
___ieee80211_stop_tx_ba_session(sta, tid,
|
||||
WLAN_BACK_INITIATOR);
|
||||
}
|
||||
spin_unlock_bh(&sta->lock);
|
||||
}
|
||||
|
||||
void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata,
|
||||
const u8 *da, u16 tid,
|
||||
u16 initiator, u16 reason_code)
|
||||
|
|
|
@ -1113,9 +1113,12 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
|
|||
|
||||
int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
|
||||
enum ieee80211_back_parties initiator);
|
||||
int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
|
||||
enum ieee80211_back_parties initiator);
|
||||
void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid);
|
||||
void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid);
|
||||
void ieee80211_tx_ba_session_work(struct work_struct *work);
|
||||
void ieee80211_ba_session_work(struct work_struct *work);
|
||||
void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid);
|
||||
|
||||
/* Spectrum management */
|
||||
void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,
|
||||
|
|
|
@ -235,7 +235,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
|
|||
spin_lock_init(&sta->lock);
|
||||
spin_lock_init(&sta->flaglock);
|
||||
INIT_WORK(&sta->drv_unblock_wk, sta_unblock);
|
||||
INIT_WORK(&sta->ampdu_mlme.work, ieee80211_tx_ba_session_work);
|
||||
INIT_WORK(&sta->ampdu_mlme.work, ieee80211_ba_session_work);
|
||||
|
||||
memcpy(sta->sta.addr, addr, ETH_ALEN);
|
||||
sta->local = local;
|
||||
|
|
Reference in a new issue