diff options
author | Rui Paulo <rpaulo@gmail.com> | 2009-11-09 18:46:55 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-13 17:43:56 -0500 |
commit | d19b3bf6384e66ac6e11a61ee31ed2cfe149f4d8 (patch) | |
tree | 2ec825639458dafddecc7e3d0f83afff9cff0cfa /net/mac80211/mesh.h | |
parent | be125c60e46e165fbfe33db36a4a9d943d560a5b (diff) |
mac80211: replace "destination" with "target" to follow the spec
Resulting object files have the same MD5 as before.
Signed-off-by: Rui Paulo <rpaulo@gmail.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Reviewed-by: Andrey Yurovsky <andrey@cozybit.com>
Tested-by: Brian Cavagnolo <brian@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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index 1d534c702406..ee687add3927 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h | |||
@@ -26,7 +26,7 @@ | |||
26 | * | 26 | * |
27 | * @MESH_PATH_ACTIVE: the mesh path can be used for forwarding | 27 | * @MESH_PATH_ACTIVE: the mesh path can be used for forwarding |
28 | * @MESH_PATH_RESOLVING: 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_SN_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 |
@@ -38,7 +38,7 @@ | |||
38 | enum mesh_path_flags { | 38 | enum mesh_path_flags { |
39 | MESH_PATH_ACTIVE = BIT(0), | 39 | MESH_PATH_ACTIVE = BIT(0), |
40 | MESH_PATH_RESOLVING = BIT(1), | 40 | MESH_PATH_RESOLVING = BIT(1), |
41 | MESH_PATH_DSN_VALID = BIT(2), | 41 | MESH_PATH_SN_VALID = BIT(2), |
42 | MESH_PATH_FIXED = BIT(3), | 42 | MESH_PATH_FIXED = BIT(3), |
43 | MESH_PATH_RESOLVED = BIT(4), | 43 | MESH_PATH_RESOLVED = BIT(4), |
44 | }; | 44 | }; |
@@ -70,7 +70,7 @@ enum mesh_deferred_task_flags { | |||
70 | * @timer: mesh path discovery timer | 70 | * @timer: mesh path discovery timer |
71 | * @frame_queue: pending queue for frames sent to this destination while the | 71 | * @frame_queue: pending queue for frames sent to this destination while the |
72 | * path is unresolved | 72 | * path is unresolved |
73 | * @dsn: destination sequence number of the destination | 73 | * @sn: target sequence number |
74 | * @metric: current metric to this destination | 74 | * @metric: current metric to this destination |
75 | * @hop_count: hops to destination | 75 | * @hop_count: hops to destination |
76 | * @exp_time: in jiffies, when the path will expire or when it expired | 76 | * @exp_time: in jiffies, when the path will expire or when it expired |
@@ -94,7 +94,7 @@ struct mesh_path { | |||
94 | struct timer_list timer; | 94 | struct timer_list timer; |
95 | struct sk_buff_head frame_queue; | 95 | struct sk_buff_head frame_queue; |
96 | struct rcu_head rcu; | 96 | struct rcu_head rcu; |
97 | u32 dsn; | 97 | u32 sn; |
98 | u32 metric; | 98 | u32 metric; |
99 | u8 hop_count; | 99 | u8 hop_count; |
100 | unsigned long exp_time; | 100 | unsigned long exp_time; |
@@ -280,7 +280,7 @@ void mesh_mpp_table_grow(void); | |||
280 | u32 mesh_table_hash(u8 *addr, struct ieee80211_sub_if_data *sdata, | 280 | u32 mesh_table_hash(u8 *addr, struct ieee80211_sub_if_data *sdata, |
281 | struct mesh_table *tbl); | 281 | struct mesh_table *tbl); |
282 | /* Mesh paths */ | 282 | /* Mesh paths */ |
283 | int mesh_path_error_tx(u8 ttl, u8 *dest, __le32 dest_dsn, __le16 dest_rcode, | 283 | int mesh_path_error_tx(u8 ttl, u8 *target, __le32 target_sn, __le16 target_rcode, |
284 | u8 *ra, struct ieee80211_sub_if_data *sdata); | 284 | u8 *ra, struct ieee80211_sub_if_data *sdata); |
285 | void mesh_path_assign_nexthop(struct mesh_path *mpath, struct sta_info *sta); | 285 | void mesh_path_assign_nexthop(struct mesh_path *mpath, struct sta_info *sta); |
286 | void mesh_path_flush_pending(struct mesh_path *mpath); | 286 | void mesh_path_flush_pending(struct mesh_path *mpath); |