diff options
| author | Thomas Pedersen <thomas@cozybit.com> | 2011-08-11 19:35:15 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-22 14:46:00 -0400 |
| commit | 25d49e4d63564c7004a4d6735d1d8c3cc41a7394 (patch) | |
| tree | c052863386c4744beb808283cc3a3ff768d417e6 /net/mac80211/mesh.h | |
| parent | 36c704fded53ee0d6866e8ae7f7e3d29cd4315b9 (diff) | |
| download | blackbird-obmc-linux-25d49e4d63564c7004a4d6735d1d8c3cc41a7394.tar.gz blackbird-obmc-linux-25d49e4d63564c7004a4d6735d1d8c3cc41a7394.zip | |
mac80211: update mesh path selection frame format
Make mesh path selection frames Mesh Action category, remove outdated
Mesh Path Selection category and defines, use updated reason codes, add
mesh_action_is_path_sel for readability, and update/correct path
selection IEs.
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mesh.h')
| -rw-r--r-- | net/mac80211/mesh.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index b794360d0dfb..3c7d0f8b376a 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h @@ -166,6 +166,9 @@ struct mesh_rmc { u32 idx_mask; }; +#define IEEE80211_MESH_PEER_INACTIVITY_LIMIT (1800 * HZ) +#define IEEE80211_MESH_HOUSEKEEPING_INTERVAL (60 * HZ) +#define IEEE80211_MESH_RANN_INTERVAL (1 * HZ) #define MESH_DEFAULT_BEACON_INTERVAL 1000 /* in 1024 us units */ @@ -177,14 +180,6 @@ struct mesh_rmc { /* Maximum number of paths per interface */ #define MESH_MAX_MPATHS 1024 -/* Pending ANA approval */ -#define MESH_PATH_SEL_ACTION 0 - -/* PERR reason codes */ -#define PEER_RCODE_UNSPECIFIED 11 -#define PERR_RCODE_NO_ROUTE 12 -#define PERR_RCODE_DEST_UNREACH 13 - /* Public interfaces */ /* Various */ int ieee80211_fill_mesh_addresses(struct ieee80211_hdr *hdr, __le16 *fc, @@ -276,6 +271,7 @@ void mesh_path_quiesce(struct ieee80211_sub_if_data *sdata); void mesh_path_restart(struct ieee80211_sub_if_data *sdata); void mesh_path_tx_root_frame(struct ieee80211_sub_if_data *sdata); +bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt); extern int mesh_paths_generation; #ifdef CONFIG_MAC80211_MESH |
