diff options
author | James Morris <jmorris@namei.org> | 2008-10-13 09:35:14 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-10-13 09:35:14 +1100 |
commit | 93db628658197aa46bd7f83d429908b6f187ec9c (patch) | |
tree | b09496f42570a5864212eb8cfde4ba2ea9fa7a40 /net/netlabel/netlabel_cipso_v4.h | |
parent | f1b2a5ace996de339292d4035f9f5b294aecd11e (diff) | |
parent | 0da939b0058742ad2d8580b7db6b966d0fc72252 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'net/netlabel/netlabel_cipso_v4.h')
-rw-r--r-- | net/netlabel/netlabel_cipso_v4.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/netlabel/netlabel_cipso_v4.h b/net/netlabel/netlabel_cipso_v4.h index 220cb9d06b4..c8a4079261f 100644 --- a/net/netlabel/netlabel_cipso_v4.h +++ b/net/netlabel/netlabel_cipso_v4.h @@ -45,12 +45,13 @@ * NLBL_CIPSOV4_A_MTYPE * NLBL_CIPSOV4_A_TAGLST * - * If using CIPSO_V4_MAP_STD the following attributes are required: + * If using CIPSO_V4_MAP_TRANS the following attributes are required: * * NLBL_CIPSOV4_A_MLSLVLLST * NLBL_CIPSOV4_A_MLSCATLST * - * If using CIPSO_V4_MAP_PASS no additional attributes are required. + * If using CIPSO_V4_MAP_PASS or CIPSO_V4_MAP_LOCAL no additional attributes + * are required. * * o REMOVE: * Sent by an application to remove a specific DOI mapping table from the @@ -76,12 +77,13 @@ * NLBL_CIPSOV4_A_MTYPE * NLBL_CIPSOV4_A_TAGLST * - * If using CIPSO_V4_MAP_STD the following attributes are required: + * If using CIPSO_V4_MAP_TRANS the following attributes are required: * * NLBL_CIPSOV4_A_MLSLVLLST * NLBL_CIPSOV4_A_MLSCATLST * - * If using CIPSO_V4_MAP_PASS no additional attributes are required. + * If using CIPSO_V4_MAP_PASS or CIPSO_V4_MAP_LOCAL no additional attributes + * are required. * * o LISTALL: * This message is sent by an application to list the valid DOIs on the |