projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'omap-for-v4.8/soc' into omap-for-v4.8/fixes
[deliverable/linux.git]
/
net
/
netlabel
/
netlabel_mgmt.h
diff --git
a/net/netlabel/netlabel_mgmt.h
b/net/netlabel/netlabel_mgmt.h
index 8b6e1ab62b485729dca126c8ab6a82671623d1fe..ea01e42bca783a8e02b93855a2e35f2b3bb3ba10 100644
(file)
--- a/
net/netlabel/netlabel_mgmt.h
+++ b/
net/netlabel/netlabel_mgmt.h
@@
-58,7
+58,10
@@
*
* NLBL_MGMT_A_CV4DOI
*
*
* NLBL_MGMT_A_CV4DOI
*
- * If using NETLBL_NLTYPE_UNLABELED no other attributes are required.
+ * If using NETLBL_NLTYPE_UNLABELED no other attributes are required,
+ * however the following attribute may optionally be sent:
+ *
+ * NLBL_MGMT_A_FAMILY
*
* o REMOVE:
* Sent by an application to remove a domain mapping from the NetLabel
*
* o REMOVE:
* Sent by an application to remove a domain mapping from the NetLabel
@@
-77,6
+80,7
@@
* Required attributes:
*
* NLBL_MGMT_A_DOMAIN
* Required attributes:
*
* NLBL_MGMT_A_DOMAIN
+ * NLBL_MGMT_A_FAMILY
*
* If the IP address selectors are not used the following attribute is
* required:
*
* If the IP address selectors are not used the following attribute is
* required:
@@
-108,7
+112,10
@@
*
* NLBL_MGMT_A_CV4DOI
*
*
* NLBL_MGMT_A_CV4DOI
*
- * If using NETLBL_NLTYPE_UNLABELED no other attributes are required.
+ * If using NETLBL_NLTYPE_UNLABELED no other attributes are required,
+ * however the following attribute may optionally be sent:
+ *
+ * NLBL_MGMT_A_FAMILY
*
* o REMOVEDEF:
* Sent by an application to remove the default domain mapping from the
*
* o REMOVEDEF:
* Sent by an application to remove the default domain mapping from the
@@
-117,13
+124,17
@@
* o LISTDEF:
* This message can be sent either from an application or by the kernel in
* response to an application generated LISTDEF message. When sent by an
* o LISTDEF:
* This message can be sent either from an application or by the kernel in
* response to an application generated LISTDEF message. When sent by an
- * application there is no payload. On success the kernel should send a
- * response using the following format.
+ * application there may be an optional payload.
*
*
- * If the IP address selectors are not used the following attribute is
+ * NLBL_MGMT_A_FAMILY
+ *
+ * On success the kernel should send a response using the following format:
+ *
+ * If the IP address selectors are not used the following attributes are
* required:
*
* NLBL_MGMT_A_PROTOCOL
* required:
*
* NLBL_MGMT_A_PROTOCOL
+ * NLBL_MGMT_A_FAMILY
*
* If the IP address selectors are used then the following attritbute is
* required:
*
* If the IP address selectors are used then the following attritbute is
* required:
@@
-209,6
+220,12
@@
enum {
/* (NLA_NESTED)
* the selector list, there must be at least one
* NLBL_MGMT_A_ADDRSELECTOR attribute */
/* (NLA_NESTED)
* the selector list, there must be at least one
* NLBL_MGMT_A_ADDRSELECTOR attribute */
+ NLBL_MGMT_A_FAMILY,
+ /* (NLA_U16)
+ * The address family */
+ NLBL_MGMT_A_CLPDOI,
+ /* (NLA_U32)
+ * the CALIPSO DOI value */
__NLBL_MGMT_A_MAX,
};
#define NLBL_MGMT_A_MAX (__NLBL_MGMT_A_MAX - 1)
__NLBL_MGMT_A_MAX,
};
#define NLBL_MGMT_A_MAX (__NLBL_MGMT_A_MAX - 1)
This page took
0.025457 seconds
and
5
git commands to generate.