diff options
Diffstat (limited to 'net/mac80211/mesh.h')
-rw-r--r-- | net/mac80211/mesh.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index cad6592c52a1..2ec7011a4d07 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h | |||
@@ -70,6 +70,7 @@ enum mesh_deferred_task_flags { | |||
70 | * @dst: mesh path destination mac address | 70 | * @dst: mesh path destination mac address |
71 | * @mpp: mesh proxy mac address | 71 | * @mpp: mesh proxy mac address |
72 | * @rhash: rhashtable list pointer | 72 | * @rhash: rhashtable list pointer |
73 | * @walk_list: linked list containing all mesh_path objects. | ||
73 | * @gate_list: list pointer for known gates list | 74 | * @gate_list: list pointer for known gates list |
74 | * @sdata: mesh subif | 75 | * @sdata: mesh subif |
75 | * @next_hop: mesh neighbor to which frames for this destination will be | 76 | * @next_hop: mesh neighbor to which frames for this destination will be |
@@ -105,6 +106,7 @@ struct mesh_path { | |||
105 | u8 dst[ETH_ALEN]; | 106 | u8 dst[ETH_ALEN]; |
106 | u8 mpp[ETH_ALEN]; /* used for MPP or MAP */ | 107 | u8 mpp[ETH_ALEN]; /* used for MPP or MAP */ |
107 | struct rhash_head rhash; | 108 | struct rhash_head rhash; |
109 | struct hlist_node walk_list; | ||
108 | struct hlist_node gate_list; | 110 | struct hlist_node gate_list; |
109 | struct ieee80211_sub_if_data *sdata; | 111 | struct ieee80211_sub_if_data *sdata; |
110 | struct sta_info __rcu *next_hop; | 112 | struct sta_info __rcu *next_hop; |
@@ -133,12 +135,16 @@ struct mesh_path { | |||
133 | * gate's mpath may or may not be resolved and active. | 135 | * gate's mpath may or may not be resolved and active. |
134 | * @gates_lock: protects updates to known_gates | 136 | * @gates_lock: protects updates to known_gates |
135 | * @rhead: the rhashtable containing struct mesh_paths, keyed by dest addr | 137 | * @rhead: the rhashtable containing struct mesh_paths, keyed by dest addr |
138 | * @walk_head: linked list containging all mesh_path objects | ||
139 | * @walk_lock: lock protecting walk_head | ||
136 | * @entries: number of entries in the table | 140 | * @entries: number of entries in the table |
137 | */ | 141 | */ |
138 | struct mesh_table { | 142 | struct mesh_table { |
139 | struct hlist_head known_gates; | 143 | struct hlist_head known_gates; |
140 | spinlock_t gates_lock; | 144 | spinlock_t gates_lock; |
141 | struct rhashtable rhead; | 145 | struct rhashtable rhead; |
146 | struct hlist_head walk_head; | ||
147 | spinlock_t walk_lock; | ||
142 | atomic_t entries; /* Up to MAX_MESH_NEIGHBOURS */ | 148 | atomic_t entries; /* Up to MAX_MESH_NEIGHBOURS */ |
143 | }; | 149 | }; |
144 | 150 | ||