diff options
author | John W. Linville <linville@tuxdriver.com> | 2008-04-08 14:15:46 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-04-08 14:15:46 -0400 |
commit | 247367016305637fb981db020679520e354c80c4 (patch) | |
tree | d1ffcbb1e88cf38eb2dc40efa80f2f6d45aa9c24 /net/mac80211/mesh.c | |
parent | 8eefca4888c986d993b2571eb31f0397a5d0a178 (diff) |
Revert "mac80211: use a struct for bss->mesh_config"
This reverts commit 6c4711b4697d93424e4b1f76a9929ba844d714a5.
That patch breaks mesh config comparison between beacons/probe reponses, so
every beacon from a mesh network would be added as a new bss. Since the
comparison has to be performed for every received beacon I believe it is best to
save the mesh config in a format easy to compare, rather than do a bunch of
unaligned accesses to compare field by field.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mesh.c')
-rw-r--r-- | net/mac80211/mesh.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index b10f1e543a94..594a3356a508 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c | |||
@@ -11,6 +11,10 @@ | |||
11 | #include "ieee80211_i.h" | 11 | #include "ieee80211_i.h" |
12 | #include "mesh.h" | 12 | #include "mesh.h" |
13 | 13 | ||
14 | #define PP_OFFSET 1 /* Path Selection Protocol */ | ||
15 | #define PM_OFFSET 5 /* Path Selection Metric */ | ||
16 | #define CC_OFFSET 9 /* Congestion Control Mode */ | ||
17 | #define CAPAB_OFFSET 17 | ||
14 | #define ACCEPT_PLINKS 0x80 | 18 | #define ACCEPT_PLINKS 0x80 |
15 | 19 | ||
16 | int mesh_allocated; | 20 | int mesh_allocated; |