From b2594528e8d86fe9d293b774ac38500086fbb7e3 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 31 May 2010 11:40:23 +0200 Subject: [PATCH] --- yaml --- r: 202821 b: refs/heads/master c: fcea60070fe8fa48df579f155ec7bc20a868f7dc h: refs/heads/master i: 202819: dcec27869c3c9fe533dfb7e1bb82f05efbc3326d v: v3 --- [refs] | 2 +- trunk/net/mac80211/sta_info.h | 44 +++++++++++++++++------------------ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/[refs] b/[refs] index 1db5cff83992..fff1ce8f7921 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08daecaead42b85b69b33d7d8429a93dfbf75b58 +refs/heads/master: fcea60070fe8fa48df579f155ec7bc20a868f7dc diff --git a/trunk/net/mac80211/sta_info.h b/trunk/net/mac80211/sta_info.h index df9d45544ca5..813da34db733 100644 --- a/trunk/net/mac80211/sta_info.h +++ b/trunk/net/mac80211/sta_info.h @@ -119,6 +119,28 @@ struct tid_ampdu_rx { u8 dialog_token; }; +/** + * struct sta_ampdu_mlme - STA aggregation information. + * + * @tid_active_rx: TID's state in Rx session state machine. + * @tid_rx: aggregation info for Rx per TID + * @tid_state_tx: TID's state in Tx session state machine. + * @tid_tx: aggregation info for Tx per TID + * @addba_req_num: number of times addBA request has been sent. + * @dialog_token_allocator: dialog token enumerator for each new session; + */ +struct sta_ampdu_mlme { + /* rx */ + bool tid_active_rx[STA_TID_NUM]; + struct tid_ampdu_rx *tid_rx[STA_TID_NUM]; + /* tx */ + u8 tid_state_tx[STA_TID_NUM]; + struct tid_ampdu_tx *tid_tx[STA_TID_NUM]; + u8 addba_req_num[STA_TID_NUM]; + u8 dialog_token_allocator; +}; + + /** * enum plink_state - state of a mesh peer link finite state machine * @@ -142,28 +164,6 @@ enum plink_state { PLINK_BLOCKED }; -/** - * struct sta_ampdu_mlme - STA aggregation information. - * - * @tid_active_rx: TID's state in Rx session state machine. - * @tid_rx: aggregation info for Rx per TID - * @tid_state_tx: TID's state in Tx session state machine. - * @tid_tx: aggregation info for Tx per TID - * @addba_req_num: number of times addBA request has been sent. - * @dialog_token_allocator: dialog token enumerator for each new session; - */ -struct sta_ampdu_mlme { - /* rx */ - bool tid_active_rx[STA_TID_NUM]; - struct tid_ampdu_rx *tid_rx[STA_TID_NUM]; - /* tx */ - u8 tid_state_tx[STA_TID_NUM]; - struct tid_ampdu_tx *tid_tx[STA_TID_NUM]; - u8 addba_req_num[STA_TID_NUM]; - u8 dialog_token_allocator; -}; - - /** * struct sta_info - STA information *