mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branches 'misc', 'qedr', 'reject-helpers', 'rxe' and 'srp' into merge-test
This commit is contained in:
commit
9032ad78bb
40 changed files with 457 additions and 162 deletions
|
|
@ -603,4 +603,10 @@ struct ib_cm_sidr_rep_param {
|
|||
int ib_send_cm_sidr_rep(struct ib_cm_id *cm_id,
|
||||
struct ib_cm_sidr_rep_param *param);
|
||||
|
||||
/**
|
||||
* ibcm_reject_msg - return a pointer to a reject message string.
|
||||
* @reason: Value returned in the REJECT event status field.
|
||||
*/
|
||||
const char *__attribute_const__ ibcm_reject_msg(int reason);
|
||||
|
||||
#endif /* IB_CM_H */
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
#define IB_MGMT_BASE_VERSION 1
|
||||
#define OPA_MGMT_BASE_VERSION 0x80
|
||||
|
||||
#define OPA_SMP_CLASS_VERSION 0x80
|
||||
#define OPA_SM_CLASS_VERSION 0x80
|
||||
|
||||
/* Management classes */
|
||||
#define IB_MGMT_CLASS_SUBN_LID_ROUTED 0x01
|
||||
|
|
|
|||
|
|
@ -253,4 +253,10 @@ int iw_cm_disconnect(struct iw_cm_id *cm_id, int abrupt);
|
|||
int iw_cm_init_qp_attr(struct iw_cm_id *cm_id, struct ib_qp_attr *qp_attr,
|
||||
int *qp_attr_mask);
|
||||
|
||||
/**
|
||||
* iwcm_reject_msg - return a pointer to a reject message string.
|
||||
* @reason: Value returned in the REJECT event status field.
|
||||
*/
|
||||
const char *__attribute_const__ iwcm_reject_msg(int reason);
|
||||
|
||||
#endif /* IW_CM_H */
|
||||
|
|
|
|||
|
|
@ -44,8 +44,6 @@
|
|||
#define OPA_MAX_SLS 32
|
||||
#define OPA_MAX_SCS 32
|
||||
|
||||
#define OPA_SMI_CLASS_VERSION 0x80
|
||||
|
||||
#define OPA_LID_PERMISSIVE cpu_to_be32(0xFFFFFFFF)
|
||||
|
||||
struct opa_smp {
|
||||
|
|
|
|||
|
|
@ -388,4 +388,29 @@ int rdma_set_afonly(struct rdma_cm_id *id, int afonly);
|
|||
*/
|
||||
__be64 rdma_get_service_id(struct rdma_cm_id *id, struct sockaddr *addr);
|
||||
|
||||
/**
|
||||
* rdma_reject_msg - return a pointer to a reject message string.
|
||||
* @id: Communication identifier that received the REJECT event.
|
||||
* @reason: Value returned in the REJECT event status field.
|
||||
*/
|
||||
const char *__attribute_const__ rdma_reject_msg(struct rdma_cm_id *id,
|
||||
int reason);
|
||||
/**
|
||||
* rdma_is_consumer_reject - return true if the consumer rejected the connect
|
||||
* request.
|
||||
* @id: Communication identifier that received the REJECT event.
|
||||
* @reason: Value returned in the REJECT event status field.
|
||||
*/
|
||||
bool rdma_is_consumer_reject(struct rdma_cm_id *id, int reason);
|
||||
|
||||
/**
|
||||
* rdma_consumer_reject_data - return the consumer reject private data and
|
||||
* length, if any.
|
||||
* @id: Communication identifier that received the REJECT event.
|
||||
* @ev: RDMA CM reject event.
|
||||
* @data_len: Pointer to the resulting length of the consumer data.
|
||||
*/
|
||||
const void *rdma_consumer_reject_data(struct rdma_cm_id *id,
|
||||
struct rdma_cm_event *ev, u8 *data_len);
|
||||
|
||||
#endif /* RDMA_CM_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue