diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-05-19 05:20:11 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2019-05-19 05:20:11 -0700 |
| commit | f1d33f18f1fbe18205f4a34cec5d515f634e02d1 (patch) | |
| tree | b3b47f0e755d7354716687822224671281df1199 /include/uapi/linux | |
| parent | f879587b713a019597d8632328b0401e9f64887f (diff) | |
| parent | 592adc48492083ee94921e48da73473888949561 (diff) | |
Merge 592adc48492083ee94921e48da73473888949561 on remote branch
Change-Id: I899c280459c88934c69596e6ba412e1e76a628d9
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/android/binder.h | 19 | ||||
| -rw-r--r-- | include/uapi/linux/msm_ipa.h | 5 | ||||
| -rw-r--r-- | include/uapi/linux/nl80211.h | 5 |
3 files changed, 27 insertions, 2 deletions
diff --git a/include/uapi/linux/android/binder.h b/include/uapi/linux/android/binder.h index bd0da0e992b8..0631c500702c 100644 --- a/include/uapi/linux/android/binder.h +++ b/include/uapi/linux/android/binder.h @@ -87,6 +87,14 @@ enum flat_binder_object_flags { * scheduling policy from the caller (for synchronous transactions). */ FLAT_BINDER_FLAG_INHERIT_RT = 0x800, + + /** + * @FLAT_BINDER_FLAG_TXN_SECURITY_CTX: request security contexts + * + * Only when set, causes senders to include their security + * context + */ + FLAT_BINDER_FLAG_TXN_SECURITY_CTX = 0x1000, }; #ifdef BINDER_IPC_32BIT @@ -264,6 +272,7 @@ struct binder_node_info_for_ref { #define BINDER_VERSION _IOWR('b', 9, struct binder_version) #define BINDER_GET_NODE_DEBUG_INFO _IOWR('b', 11, struct binder_node_debug_info) #define BINDER_GET_NODE_INFO_FOR_REF _IOWR('b', 12, struct binder_node_info_for_ref) +#define BINDER_SET_CONTEXT_MGR_EXT _IOW('b', 13, struct flat_binder_object) /* * NOTE: Two special error codes you should check for when calling @@ -322,6 +331,11 @@ struct binder_transaction_data { } data; }; +struct binder_transaction_data_secctx { + struct binder_transaction_data transaction_data; + binder_uintptr_t secctx; +}; + struct binder_transaction_data_sg { struct binder_transaction_data transaction_data; binder_size_t buffers_size; @@ -357,6 +371,11 @@ enum binder_driver_return_protocol { BR_OK = _IO('r', 1), /* No parameters! */ + BR_TRANSACTION_SEC_CTX = _IOR('r', 2, + struct binder_transaction_data_secctx), + /* + * binder_transaction_data_secctx: the received command. + */ BR_TRANSACTION = _IOR('r', 2, struct binder_transaction_data), BR_REPLY = _IOR('r', 3, struct binder_transaction_data), /* diff --git a/include/uapi/linux/msm_ipa.h b/include/uapi/linux/msm_ipa.h index be3c68aaf23c..296784dcca6d 100644 --- a/include/uapi/linux/msm_ipa.h +++ b/include/uapi/linux/msm_ipa.h @@ -36,6 +36,11 @@ #define IPA_DFLT_RT_TBL_NAME "ipa_dflt_rt" /** + * name for default value of invalid protocol of NAT + */ +#define IPAHAL_NAT_INVALID_PROTOCOL 0xFF + +/** * commands supported by IPA driver */ #define IPA_IOCTL_ADD_HDR 0 diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 9ac3946a916f..7877fac7c60a 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -992,8 +992,8 @@ * * @NL80211_CMD_UPDATE_OWE_INFO: This interface allows the host driver to * offload OWE processing to user space. This intends to support - * OWE/Enhanced Open AKM by the host drivers that implemnt SME but rely - * on the user space for the crypotographic/DH IE processing. + * OWE AKM by the host drivers that implement SME but rely + * on the user space for the cryptographic/DH IE processing in AP mode. * * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use @@ -1216,6 +1216,7 @@ enum nl80211_commands { NL80211_CMD_NOTIFY_RADAR, NL80211_CMD_UPDATE_OWE_INFO, + /* add new commands above here */ /* used to define NL80211_CMD_MAX below */ |