Revert "SMACK: netework label match fix"

[kernel/linux-3.0.git] / security / smack / smack.h

diff --git a/security/smack/smack.h b/security/smack/smack.h
index c6760d6..156fdf9 100644 (file)
--- a/security/smack/smack.h
+++ b/security/smack/smack.h
@@ -160,13 +160,9 @@ struct smack_known {
 #define SMACK_CIPSO_DOI_INVALID                -1      /* Not a DOI */
 #define SMACK_CIPSO_DIRECT_DEFAULT     250     /* Arbitrary */
 #define SMACK_CIPSO_MAPPED_DEFAULT     251     /* Also arbitrary */
+#define SMACK_CIPSO_MAXCATVAL          63      /* Bigger gets harder */
 #define SMACK_CIPSO_MAXLEVEL            255     /* CIPSO 2.2 standard */
-/*
- * CIPSO 2.2 standard is 239, but Smack wants to use the
- * categories in a structured way that limits the value to
- * the bits in 23 bytes, hence the unusual number.
- */
-#define SMACK_CIPSO_MAXCATNUM           184     /* 23 * 8 */
+#define SMACK_CIPSO_MAXCATNUM           239     /* CIPSO 2.2 standard */
 
 /*
  * Flag for transmute access