From 653676dde821ce2793f270501847beedbf4a194a Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Thu, 18 Sep 2014 13:14:58 -0700 Subject: [PATCH] Move to v3.16.3 kernel headers. Change-Id: Ife491bd7630b853a78532dd74e4644438256a3a1 --- libc/kernel/uapi/linux/version.h | 2 +- libc/kernel/uapi/rdma/rdma_user_cm.h | 114 ++++++++++++++------------- 2 files changed, 59 insertions(+), 57 deletions(-) diff --git a/libc/kernel/uapi/linux/version.h b/libc/kernel/uapi/linux/version.h index f9068b72f..2d66eba22 100644 --- a/libc/kernel/uapi/linux/version.h +++ b/libc/kernel/uapi/linux/version.h @@ -16,5 +16,5 @@ *** **************************************************************************** ****************************************************************************/ -#define LINUX_VERSION_CODE 200705 +#define LINUX_VERSION_CODE 200707 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/libc/kernel/uapi/rdma/rdma_user_cm.h b/libc/kernel/uapi/rdma/rdma_user_cm.h index 74e5a054f..d1422612f 100644 --- a/libc/kernel/uapi/rdma/rdma_user_cm.h +++ b/libc/kernel/uapi/rdma/rdma_user_cm.h @@ -19,283 +19,285 @@ #ifndef RDMA_USER_CM_H #define RDMA_USER_CM_H #include -#include +#include /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#include #include #include #define RDMA_USER_CM_ABI_VERSION 4 -#define RDMA_MAX_PRIVATE_DATA 256 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define RDMA_MAX_PRIVATE_DATA 256 enum { RDMA_USER_CM_CMD_CREATE_ID, RDMA_USER_CM_CMD_DESTROY_ID, - RDMA_USER_CM_CMD_BIND_IP, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + RDMA_USER_CM_CMD_BIND_IP, RDMA_USER_CM_CMD_RESOLVE_IP, RDMA_USER_CM_CMD_RESOLVE_ROUTE, RDMA_USER_CM_CMD_QUERY_ROUTE, - RDMA_USER_CM_CMD_CONNECT, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + RDMA_USER_CM_CMD_CONNECT, RDMA_USER_CM_CMD_LISTEN, RDMA_USER_CM_CMD_ACCEPT, RDMA_USER_CM_CMD_REJECT, - RDMA_USER_CM_CMD_DISCONNECT, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + RDMA_USER_CM_CMD_DISCONNECT, RDMA_USER_CM_CMD_INIT_QP_ATTR, RDMA_USER_CM_CMD_GET_EVENT, RDMA_USER_CM_CMD_GET_OPTION, - RDMA_USER_CM_CMD_SET_OPTION, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + RDMA_USER_CM_CMD_SET_OPTION, RDMA_USER_CM_CMD_NOTIFY, RDMA_USER_CM_CMD_JOIN_IP_MCAST, RDMA_USER_CM_CMD_LEAVE_MCAST, - RDMA_USER_CM_CMD_MIGRATE_ID, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + RDMA_USER_CM_CMD_MIGRATE_ID, RDMA_USER_CM_CMD_QUERY, RDMA_USER_CM_CMD_BIND, RDMA_USER_CM_CMD_RESOLVE_ADDR, - RDMA_USER_CM_CMD_JOIN_MCAST /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + RDMA_USER_CM_CMD_JOIN_MCAST }; struct rdma_ucm_cmd_hdr { __u32 cmd; - __u16 in; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u16 in; __u16 out; }; struct rdma_ucm_create_id { - __u64 uid; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u64 uid; __u64 response; __u16 ps; __u8 qp_type; - __u8 reserved[5]; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u8 reserved[5]; }; struct rdma_ucm_create_id_resp { __u32 id; -}; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +}; struct rdma_ucm_destroy_id { __u64 response; __u32 id; - __u32 reserved; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 reserved; }; struct rdma_ucm_destroy_id_resp { __u32 events_reported; -}; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +}; struct rdma_ucm_bind_ip { __u64 response; struct sockaddr_in6 addr; - __u32 id; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 id; }; struct rdma_ucm_bind { __u32 id; - __u16 addr_size; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u16 addr_size; __u16 reserved; struct sockaddr_storage addr; }; -struct rdma_ucm_resolve_ip { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +struct rdma_ucm_resolve_ip { struct sockaddr_in6 src_addr; struct sockaddr_in6 dst_addr; __u32 id; - __u32 timeout_ms; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 timeout_ms; }; struct rdma_ucm_resolve_addr { __u32 id; - __u32 timeout_ms; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 timeout_ms; __u16 src_size; __u16 dst_size; __u32 reserved; - struct sockaddr_storage src_addr; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct sockaddr_storage src_addr; struct sockaddr_storage dst_addr; }; struct rdma_ucm_resolve_route { - __u32 id; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 id; __u32 timeout_ms; }; enum { - RDMA_USER_CM_QUERY_ADDR, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + RDMA_USER_CM_QUERY_ADDR, RDMA_USER_CM_QUERY_PATH, RDMA_USER_CM_QUERY_GID }; -struct rdma_ucm_query { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +struct rdma_ucm_query { __u64 response; __u32 id; __u32 option; -}; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +}; struct rdma_ucm_query_route_resp { __u64 node_guid; struct ib_user_path_rec ib_route[2]; - struct sockaddr_in6 src_addr; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct sockaddr_in6 src_addr; struct sockaddr_in6 dst_addr; __u32 num_paths; __u8 port_num; - __u8 reserved[3]; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u8 reserved[3]; }; struct rdma_ucm_query_addr_resp { __u64 node_guid; - __u8 port_num; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u8 port_num; __u8 reserved; __u16 pkey; __u16 src_size; - __u16 dst_size; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u16 dst_size; struct sockaddr_storage src_addr; struct sockaddr_storage dst_addr; }; -struct rdma_ucm_query_path_resp { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +struct rdma_ucm_query_path_resp { __u32 num_paths; __u32 reserved; struct ib_path_rec_data path_data[0]; -}; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +}; struct rdma_ucm_conn_param { __u32 qp_num; __u32 qkey; - __u8 private_data[RDMA_MAX_PRIVATE_DATA]; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u8 private_data[RDMA_MAX_PRIVATE_DATA]; __u8 private_data_len; __u8 srq; __u8 responder_resources; - __u8 initiator_depth; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u8 initiator_depth; __u8 flow_control; __u8 retry_count; __u8 rnr_retry_count; - __u8 valid; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u8 valid; }; struct rdma_ucm_ud_param { __u32 qp_num; - __u32 qkey; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 qkey; struct ib_uverbs_ah_attr ah_attr; __u8 private_data[RDMA_MAX_PRIVATE_DATA]; __u8 private_data_len; - __u8 reserved[7]; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u8 reserved[7]; }; struct rdma_ucm_connect { struct rdma_ucm_conn_param conn_param; - __u32 id; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 id; __u32 reserved; }; struct rdma_ucm_listen { - __u32 id; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 id; __u32 backlog; }; struct rdma_ucm_accept { - __u64 uid; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u64 uid; struct rdma_ucm_conn_param conn_param; __u32 id; __u32 reserved; -}; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +}; struct rdma_ucm_reject { __u32 id; __u8 private_data_len; - __u8 reserved[3]; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u8 reserved[3]; __u8 private_data[RDMA_MAX_PRIVATE_DATA]; }; struct rdma_ucm_disconnect { - __u32 id; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 id; }; struct rdma_ucm_init_qp_attr { __u64 response; - __u32 id; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 id; __u32 qp_state; }; struct rdma_ucm_notify { - __u32 id; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 id; __u32 event; }; struct rdma_ucm_join_ip_mcast { - __u64 response; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u64 response; __u64 uid; struct sockaddr_in6 addr; __u32 id; -}; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +}; struct rdma_ucm_join_mcast { __u64 response; __u64 uid; - __u32 id; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 id; __u16 addr_size; __u16 reserved; struct sockaddr_storage addr; -}; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +}; struct rdma_ucm_get_event { __u64 response; }; -struct rdma_ucm_event_resp { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +struct rdma_ucm_event_resp { __u64 uid; __u32 id; __u32 event; - __u32 status; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 status; union { struct rdma_ucm_conn_param conn; struct rdma_ucm_ud_param ud; - } param; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + } param; }; enum { RDMA_OPTION_ID = 0, - RDMA_OPTION_IB = 1 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + RDMA_OPTION_IB = 1 }; enum { RDMA_OPTION_ID_TOS = 0, - RDMA_OPTION_ID_REUSEADDR = 1, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + RDMA_OPTION_ID_REUSEADDR = 1, RDMA_OPTION_ID_AFONLY = 2, RDMA_OPTION_IB_PATH = 1 }; -struct rdma_ucm_set_option { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +struct rdma_ucm_set_option { __u64 optval; __u32 id; __u32 level; - __u32 optname; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 optname; __u32 optlen; }; struct rdma_ucm_migrate_id { - __u64 response; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u64 response; __u32 id; __u32 fd; }; -struct rdma_ucm_migrate_resp { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +struct rdma_ucm_migrate_resp { __u32 events_reported; }; #endif +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */