wireless: move mesh config length constant

This is a constant from the 802.11 specification.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index aad99195a4cc6f839c7cd40e7c0fc1853937fd08..9dc288b920c8f07363c12f31180de20564aa8ef2 100644 (file)
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -97,7 +97,10 @@
 #define IEEE80211_MAX_FRAME_LEN                2352
 
 #define IEEE80211_MAX_SSID_LEN         32
+
 #define IEEE80211_MAX_MESH_ID_LEN      32
+#define IEEE80211_MESH_CONFIG_LEN      19
+
 #define IEEE80211_QOS_CTL_LEN          2
 #define IEEE80211_QOS_CTL_TID_MASK     0x000F
 #define IEEE80211_QOS_CTL_TAG1D_MASK   0x0007

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index d3b6e1a648bd1ba9fa50904fc6b58c7ffd6ff41d..82f568e943657c2c5114ef111f57e53292011edc 100644 (file)
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -238,7 +238,7 @@ void mesh_mgmt_ies_add(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata)
 
        pos = skb_put(skb, 21);
        *pos++ = WLAN_EID_MESH_CONFIG;
-       *pos++ = MESH_CFG_LEN;
+       *pos++ = IEEE80211_MESH_CONFIG_LEN;
        /* Version */
        *pos++ = 1;
 

diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index e10471c6ba42457894ebca93db6a7f8c9376323f..c197ab545e54a05e56b46f946d1d2bb8e3f5e5e9 100644 (file)
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -145,9 +145,6 @@ struct mesh_rmc {
 };
 
 
-/* Mesh IEs constants */
-#define MESH_CFG_LEN           19
-
 /*
  * MESH_CFG_COMP_LEN Includes:
  *     - Active path selection protocol ID.
@@ -157,7 +154,7 @@ struct mesh_rmc {
  * Does not include mesh capabilities, which may vary across nodes in the same
  * mesh
  */
-#define MESH_CFG_CMP_LEN       17
+#define MESH_CFG_CMP_LEN       (IEEE80211_MESH_CONFIG_LEN - 2)
 
 /* Default values, timeouts in ms */
 #define MESH_TTL               5

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 7372d7abb8c0ecc439bb5a076640d1168e65947f..f5c7c3371929a5c41651bcbefa45771149b5c2d4 100644 (file)
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -159,7 +159,7 @@ ieee80211_rx_mesh_bss_add(struct ieee80211_local *local, u8 *mesh_id, int mesh_i
 {
        struct ieee80211_bss *bss;
 
-       if (mesh_config_len != MESH_CFG_LEN)
+       if (mesh_config_len != IEEE80211_MESH_CONFIG_LEN)
                return NULL;
 
        bss = kzalloc(sizeof(*bss), GFP_ATOMIC);