X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fmac80211%2Fmesh.h;h=2e161f6d8288255d47609fb83febf9bc2faae5ba;hb=9df2fe986770bc4c76e8fe72c20b71268eec39a7;hp=8ff46ea0f1d720d0109f44d666172e25fd7ad9fb;hpb=e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a;p=linux-2.6

diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index 8ff46ea0f1..2e161f6d82 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -13,6 +13,7 @@
 
 #include <linux/types.h>
 #include <linux/jhash.h>
+#include <asm/unaligned.h>
 #include "ieee80211_i.h"
 
 
@@ -139,7 +140,7 @@ struct rmc_entry {
 
 struct mesh_rmc {
 	struct rmc_entry bucket[RMC_BUCKETS];
-	u8 idx_mask;
+	u32 idx_mask;
 };
 
 
@@ -157,16 +158,6 @@ struct mesh_rmc {
  */
 #define MESH_CFG_CMP_LEN 	17
 
-/*
- * Components offset within the mesh configuration IE
- */
-#define PP_OFFSET	1		/* Path Selection Protocol */
-#define PM_OFFSET	5		/* Path Selection Metric   */
-#define CC_OFFSET	9		/* Congestion Control Mode */
-#define CP_OFFSET	13		/* Channel Precedence */
-#define CAPAB_OFFSET	17		/* Mesh Capabilities */
-
-
 /* Default values, timeouts in ms */
 #define MESH_TTL 		5
 #define MESH_MAX_RETR	 	3