diff options
Diffstat (limited to 'net/mac80211/mesh.h')
| -rw-r--r-- | net/mac80211/mesh.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index c197ab545e54..d891d7ddccd7 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h | |||
| @@ -24,15 +24,15 @@ | |||
| 24 | * | 24 | * |
| 25 | * | 25 | * |
| 26 | * | 26 | * |
| 27 | * @MESH_PATH_ACTIVE: the mesh path is can be used for forwarding | 27 | * @MESH_PATH_ACTIVE: the mesh path can be used for forwarding |
| 28 | * @MESH_PATH_RESOLVED: the discovery process is running for this mesh path | 28 | * @MESH_PATH_RESOLVING: the discovery process is running for this mesh path |
| 29 | * @MESH_PATH_DSN_VALID: the mesh path contains a valid destination sequence | 29 | * @MESH_PATH_DSN_VALID: the mesh path contains a valid destination sequence |
| 30 | * number | 30 | * number |
| 31 | * @MESH_PATH_FIXED: the mesh path has been manually set and should not be | 31 | * @MESH_PATH_FIXED: the mesh path has been manually set and should not be |
| 32 | * modified | 32 | * modified |
| 33 | * @MESH_PATH_RESOLVED: the mesh path can has been resolved | 33 | * @MESH_PATH_RESOLVED: the mesh path can has been resolved |
| 34 | * | 34 | * |
| 35 | * MESH_PATH_RESOLVED and MESH_PATH_DELETE are used by the mesh path timer to | 35 | * MESH_PATH_RESOLVED is used by the mesh path timer to |
| 36 | * decide when to stop or cancel the mesh path discovery. | 36 | * decide when to stop or cancel the mesh path discovery. |
| 37 | */ | 37 | */ |
| 38 | enum mesh_path_flags { | 38 | enum mesh_path_flags { |
| @@ -196,7 +196,6 @@ struct mesh_rmc { | |||
| 196 | 196 | ||
| 197 | /* Public interfaces */ | 197 | /* Public interfaces */ |
| 198 | /* Various */ | 198 | /* Various */ |
| 199 | u8 mesh_id_hash(u8 *mesh_id, int mesh_id_len); | ||
| 200 | int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr); | 199 | int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr); |
| 201 | int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr, | 200 | int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr, |
| 202 | struct ieee80211_sub_if_data *sdata); | 201 | struct ieee80211_sub_if_data *sdata); |
| @@ -236,14 +235,13 @@ void mesh_rx_path_sel_frame(struct ieee80211_sub_if_data *sdata, | |||
| 236 | struct ieee80211_mgmt *mgmt, size_t len); | 235 | struct ieee80211_mgmt *mgmt, size_t len); |
| 237 | int mesh_path_add(u8 *dst, struct ieee80211_sub_if_data *sdata); | 236 | int mesh_path_add(u8 *dst, struct ieee80211_sub_if_data *sdata); |
| 238 | /* Mesh plinks */ | 237 | /* Mesh plinks */ |
| 239 | void mesh_neighbour_update(u8 *hw_addr, u64 rates, | 238 | void mesh_neighbour_update(u8 *hw_addr, u32 rates, |
| 240 | struct ieee80211_sub_if_data *sdata, bool add); | 239 | struct ieee80211_sub_if_data *sdata, bool add); |
| 241 | bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie); | 240 | bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie); |
| 242 | void mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata); | 241 | void mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata); |
| 243 | void mesh_plink_broken(struct sta_info *sta); | 242 | void mesh_plink_broken(struct sta_info *sta); |
| 244 | void mesh_plink_deactivate(struct sta_info *sta); | 243 | void mesh_plink_deactivate(struct sta_info *sta); |
| 245 | int mesh_plink_open(struct sta_info *sta); | 244 | int mesh_plink_open(struct sta_info *sta); |
| 246 | int mesh_plink_close(struct sta_info *sta); | ||
| 247 | void mesh_plink_block(struct sta_info *sta); | 245 | void mesh_plink_block(struct sta_info *sta); |
| 248 | void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, | 246 | void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, |
| 249 | struct ieee80211_mgmt *mgmt, size_t len, | 247 | struct ieee80211_mgmt *mgmt, size_t len, |