diff options
author | Luis Carlos Cobo <luisca@cozybit.com> | 2008-02-29 18:46:08 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-03-06 16:40:52 -0500 |
commit | b4e08ea141e6d663dec31b31d6289baeaaa2a3a2 (patch) | |
tree | f6ca4b30e480f803f5f83c2d60e0df29fb2177ea /net/mac80211/sta_info.h | |
parent | cfa22c716f65b4d286a68aeacee4a7361a4035e6 (diff) |
mac80211: add PLINK_ prefix and kernel doc to enum plink_state
Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/sta_info.h')
-rw-r--r-- | net/mac80211/sta_info.h | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 547bfc3b2431..f166c8039f2b 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h | |||
@@ -106,14 +106,27 @@ struct tid_ampdu_rx { | |||
106 | struct timer_list session_timer; | 106 | struct timer_list session_timer; |
107 | }; | 107 | }; |
108 | 108 | ||
109 | /** | ||
110 | * enum plink_state - state of a mesh peer link finite state machine | ||
111 | * | ||
112 | * @PLINK_LISTEN: initial state, considered the implicit state of non existant | ||
113 | * mesh peer links | ||
114 | * @PLINK_OPN_SNT: mesh plink open frame has been sent to this mesh peer | ||
115 | * @PLINK_OPN_RCVD: mesh plink open frame has been received from this mesh peer | ||
116 | * @PLINK_CNF_RCVD: mesh plink confirm frame has been received from this mesh | ||
117 | * peer | ||
118 | * @PLINK_ESTAB: mesh peer link is established | ||
119 | * @PLINK_HOLDING: mesh peer link is being closed or cancelled | ||
120 | * @PLINK_BLOCKED: all frames transmitted from this mesh plink are discarded | ||
121 | */ | ||
109 | enum plink_state { | 122 | enum plink_state { |
110 | LISTEN, | 123 | PLINK_LISTEN, |
111 | OPN_SNT, | 124 | PLINK_OPN_SNT, |
112 | OPN_RCVD, | 125 | PLINK_OPN_RCVD, |
113 | CNF_RCVD, | 126 | PLINK_CNF_RCVD, |
114 | ESTAB, | 127 | PLINK_ESTAB, |
115 | HOLDING, | 128 | PLINK_HOLDING, |
116 | BLOCKED | 129 | PLINK_BLOCKED |
117 | }; | 130 | }; |
118 | 131 | ||
119 | /** | 132 | /** |
@@ -248,7 +261,7 @@ struct sta_info { | |||
248 | */ | 261 | */ |
249 | __le16 llid; /* Local link ID */ | 262 | __le16 llid; /* Local link ID */ |
250 | __le16 plid; /* Peer link ID */ | 263 | __le16 plid; /* Peer link ID */ |
251 | __le16 reason; /* Buffer for cancel reason on HOLDING state */ | 264 | __le16 reason; /* Cancel reason on PLINK_HOLDING state */ |
252 | u8 plink_retries; /* Retries in establishment */ | 265 | u8 plink_retries; /* Retries in establishment */ |
253 | bool ignore_plink_timer; | 266 | bool ignore_plink_timer; |
254 | enum plink_state plink_state; | 267 | enum plink_state plink_state; |
@@ -280,7 +293,7 @@ static inline enum plink_state sta_plink_state(struct sta_info *sta) | |||
280 | #ifdef CONFIG_MAC80211_MESH | 293 | #ifdef CONFIG_MAC80211_MESH |
281 | return sta->plink_state; | 294 | return sta->plink_state; |
282 | #endif | 295 | #endif |
283 | return LISTEN; | 296 | return PLINK_LISTEN; |
284 | } | 297 | } |
285 | 298 | ||
286 | 299 | ||