Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[karo-tx-linux.git] / net / mac80211 / mesh.h

diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index 85562c59d7d68bd656fdd1ca00f6129b8adefe8c..c88087f1cd0ff79a4a5f28c57f2626d5c7ce8eac 100644 (file)
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -209,8 +209,6 @@ struct mesh_rmc {
 #define MESH_MAX_MPATHS                1024
 
 /* Pending ANA approval */
-#define MESH_PLINK_CATEGORY    30
-#define MESH_PATH_SEL_CATEGORY 32
 #define MESH_PATH_SEL_ACTION   0
 
 /* PERR reason codes */