diff options
| author | John W. Linville | 2008-04-08 20:15:46 +0200 |
|---|---|---|
| committer | John W. Linville | 2008-04-08 20:15:46 +0200 |
| commit | 247367016305637fb981db020679520e354c80c4 (patch) | |
| tree | d1ffcbb1e88cf38eb2dc40efa80f2f6d45aa9c24 /net/mac80211/mesh.c | |
| parent | Merge branch 'net-2.6.26-isatap-20080403' of git://git.linux-ipv6.org/gitroot... (diff) | |
| download | kernel-qcow2-linux-247367016305637fb981db020679520e354c80c4.tar.gz kernel-qcow2-linux-247367016305637fb981db020679520e354c80c4.tar.xz kernel-qcow2-linux-247367016305637fb981db020679520e354c80c4.zip | |
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 @@ #include "ieee80211_i.h" #include "mesh.h" +#define PP_OFFSET 1 /* Path Selection Protocol */ +#define PM_OFFSET 5 /* Path Selection Metric */ +#define CC_OFFSET 9 /* Congestion Control Mode */ +#define CAPAB_OFFSET 17 #define ACCEPT_PLINKS 0x80 int mesh_allocated; |