diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 16:44:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 16:44:34 -0700 |
| commit | 75f5076b12924f53340209d2cde73b98ed3b3095 (patch) | |
| tree | 82bad4b458c0a7e54d264d407de12390275a1b24 /include | |
| parent | 83d7e948754cf021ed7343b122940fcc27c1bd88 (diff) | |
| parent | 1df9fad1220beb21b4b4230373cbf4924436dd88 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/qib: Use pci_dev->revision
RDMA/iwcm: Get rid of enum iw_cm_event_status
IB/ipath: Use pci_dev->revision, again
IB/qib: Prevent driver hang with unprogrammed boards
RDMA/cxgb4: EEH errors can hang the driver
RDMA/cxgb4: Reset wait condition atomically
RDMA/cxgb4: Fix missing parentheses
RDMA/cxgb4: Initialization errors can cause crash
RDMA/cxgb4: Don't change QP state outside EP lock
RDMA/cma: Add an ID_REUSEADDR option
RDMA/cma: Fix handling of IPv6 addressing in cma_use_port
Diffstat (limited to 'include')
| -rw-r--r-- | include/rdma/iw_cm.h | 11 | ||||
| -rw-r--r-- | include/rdma/rdma_cm.h | 10 | ||||
| -rw-r--r-- | include/rdma/rdma_user_cm.h | 5 |
3 files changed, 14 insertions, 12 deletions
diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h index cbb822e8d791..2d0191c90f9e 100644 --- a/include/rdma/iw_cm.h +++ b/include/rdma/iw_cm.h @@ -46,18 +46,9 @@ enum iw_cm_event_type { IW_CM_EVENT_CLOSE /* close complete */ }; -enum iw_cm_event_status { - IW_CM_EVENT_STATUS_OK = 0, /* request successful */ - IW_CM_EVENT_STATUS_ACCEPTED = 0, /* connect request accepted */ - IW_CM_EVENT_STATUS_REJECTED, /* connect request rejected */ - IW_CM_EVENT_STATUS_TIMEOUT, /* the operation timed out */ - IW_CM_EVENT_STATUS_RESET, /* reset from remote peer */ - IW_CM_EVENT_STATUS_EINVAL, /* asynchronous failure for bad parm */ -}; - struct iw_cm_event { enum iw_cm_event_type event; - enum iw_cm_event_status status; + int status; struct sockaddr_in local_addr; struct sockaddr_in remote_addr; void *private_data; diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h index 4fae90304648..169f7a53fb0c 100644 --- a/include/rdma/rdma_cm.h +++ b/include/rdma/rdma_cm.h @@ -329,4 +329,14 @@ void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr); */ void rdma_set_service_type(struct rdma_cm_id *id, int tos); +/** + * rdma_set_reuseaddr - Allow the reuse of local addresses when binding + * the rdma_cm_id. + * @id: Communication identifier to configure. + * @reuse: Value indicating if the bound address is reusable. + * + * Reuse must be set before an address is bound to the id. + */ +int rdma_set_reuseaddr(struct rdma_cm_id *id, int reuse); + #endif /* RDMA_CM_H */ diff --git a/include/rdma/rdma_user_cm.h b/include/rdma/rdma_user_cm.h index 1d165022c02d..fc82c1896f75 100644 --- a/include/rdma/rdma_user_cm.h +++ b/include/rdma/rdma_user_cm.h @@ -221,8 +221,9 @@ enum { /* Option details */ enum { - RDMA_OPTION_ID_TOS = 0, - RDMA_OPTION_IB_PATH = 1 + RDMA_OPTION_ID_TOS = 0, + RDMA_OPTION_ID_REUSEADDR = 1, + RDMA_OPTION_IB_PATH = 1 }; struct rdma_ucm_set_option { |