diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-05-31 05:40:23 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-03 14:10:45 -0400 |
commit | fcea60070fe8fa48df579f155ec7bc20a868f7dc (patch) | |
tree | 67472138256d8db1a1489e22a0c6a85f194fbe8e /net/mac80211 | |
parent | 08daecaead42b85b69b33d7d8429a93dfbf75b58 (diff) |
mac80211: move plink state
For some odd reason, the plink_state enum is
declared in the middle between aggregation
related structures. Move it down to make the
file easier to read.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/sta_info.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index df9d45544ca5..813da34db733 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h | |||
@@ -120,6 +120,28 @@ struct tid_ampdu_rx { | |||
120 | }; | 120 | }; |
121 | 121 | ||
122 | /** | 122 | /** |
123 | * struct sta_ampdu_mlme - STA aggregation information. | ||
124 | * | ||
125 | * @tid_active_rx: TID's state in Rx session state machine. | ||
126 | * @tid_rx: aggregation info for Rx per TID | ||
127 | * @tid_state_tx: TID's state in Tx session state machine. | ||
128 | * @tid_tx: aggregation info for Tx per TID | ||
129 | * @addba_req_num: number of times addBA request has been sent. | ||
130 | * @dialog_token_allocator: dialog token enumerator for each new session; | ||
131 | */ | ||
132 | struct sta_ampdu_mlme { | ||
133 | /* rx */ | ||
134 | bool tid_active_rx[STA_TID_NUM]; | ||
135 | struct tid_ampdu_rx *tid_rx[STA_TID_NUM]; | ||
136 | /* tx */ | ||
137 | u8 tid_state_tx[STA_TID_NUM]; | ||
138 | struct tid_ampdu_tx *tid_tx[STA_TID_NUM]; | ||
139 | u8 addba_req_num[STA_TID_NUM]; | ||
140 | u8 dialog_token_allocator; | ||
141 | }; | ||
142 | |||
143 | |||
144 | /** | ||
123 | * enum plink_state - state of a mesh peer link finite state machine | 145 | * enum plink_state - state of a mesh peer link finite state machine |
124 | * | 146 | * |
125 | * @PLINK_LISTEN: initial state, considered the implicit state of non existant | 147 | * @PLINK_LISTEN: initial state, considered the implicit state of non existant |
@@ -143,28 +165,6 @@ enum plink_state { | |||
143 | }; | 165 | }; |
144 | 166 | ||
145 | /** | 167 | /** |
146 | * struct sta_ampdu_mlme - STA aggregation information. | ||
147 | * | ||
148 | * @tid_active_rx: TID's state in Rx session state machine. | ||
149 | * @tid_rx: aggregation info for Rx per TID | ||
150 | * @tid_state_tx: TID's state in Tx session state machine. | ||
151 | * @tid_tx: aggregation info for Tx per TID | ||
152 | * @addba_req_num: number of times addBA request has been sent. | ||
153 | * @dialog_token_allocator: dialog token enumerator for each new session; | ||
154 | */ | ||
155 | struct sta_ampdu_mlme { | ||
156 | /* rx */ | ||
157 | bool tid_active_rx[STA_TID_NUM]; | ||
158 | struct tid_ampdu_rx *tid_rx[STA_TID_NUM]; | ||
159 | /* tx */ | ||
160 | u8 tid_state_tx[STA_TID_NUM]; | ||
161 | struct tid_ampdu_tx *tid_tx[STA_TID_NUM]; | ||
162 | u8 addba_req_num[STA_TID_NUM]; | ||
163 | u8 dialog_token_allocator; | ||
164 | }; | ||
165 | |||
166 | |||
167 | /** | ||
168 | * struct sta_info - STA information | 168 | * struct sta_info - STA information |
169 | * | 169 | * |
170 | * This structure collects information about a station that | 170 | * This structure collects information about a station that |