diff --git a/[refs] b/[refs]
index 96ae221110b7..50a7988e2323 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b7e6bce41b6b944bd4302cf0914e2a6f4bc704b
+refs/heads/master: 38cd6b4f52a75926fd81fc85f53f5067dcd809f7
diff --git a/trunk/net/mac80211/mesh.h b/trunk/net/mac80211/mesh.h
index 039d7fa0af74..5b828fa8c541 100644
--- a/trunk/net/mac80211/mesh.h
+++ b/trunk/net/mac80211/mesh.h
@@ -164,17 +164,6 @@ struct mesh_rmc {
 };
 
 
-/*
- * MESH_CFG_COMP_LEN Includes:
- * 	- Active path selection protocol ID.
- * 	- Active path selection metric ID.
- * 	- Congestion control mode identifier.
- * 	- Channel precedence.
- * Does not include mesh capabilities, which may vary across nodes in the same
- * mesh
- */
-#define MESH_CFG_CMP_LEN 	(IEEE80211_MESH_CONFIG_LEN - 2)
-
 #define MESH_DEFAULT_BEACON_INTERVAL		1000 	/* in 1024 us units */
 
 #define MESH_PATH_EXPIRE (600 * HZ)