diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:00:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:00:26 -0800 |
| commit | 976fd0e29cb1647bf59f939f81a22eba55c2bf0c (patch) | |
| tree | c10de669fe39995619e5a972ae8518f72ff9b8d9 /include/rdma/rdma_cm_ib.h | |
| parent | 733abe4fff3afa13e301bc8bc5bee9aac4b59fdc (diff) | |
| parent | 7084f8429c940bac856123ce6d3946638fe20364 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IB/core: Set static rate in ib_init_ah_from_path()
IB/ipath: Make ipath_map_sg() static
IB/core: Fix sparse warnings about shadowed declarations
RDMA/cma: Add multicast communication support
IB/sa: Track multicast join/leave requests
IPoIB: CM error handling thinko fix
RDMA/cxgb3: Remove Open Grid Computing copyrights in iw_cxgb3 driver
RDMA/cxgb3: Fail posts synchronously when in TERMINATE state
RDMA/iwcm: iw_cm_id destruction race fixes
IB/ehca: Change query_port() to return LINK_UP instead UNKNOWN
IB/ehca: Allow en/disabling scaling code via module parameter
IB/ehca: Fix race condition/locking issues in scaling code
IB/ehca: Rework irq handler
IPoIB: Only allow root to change between datagram and connected mode
IB/mthca: Fix allocation of ICM chunks in coherent memory
IB/mthca: Allow the QP state transition RESET->RESET
Diffstat (limited to 'include/rdma/rdma_cm_ib.h')
| -rw-r--r-- | include/rdma/rdma_cm_ib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/rdma/rdma_cm_ib.h b/include/rdma/rdma_cm_ib.h index 9b176df1d66..950424b38f1 100644 --- a/include/rdma/rdma_cm_ib.h +++ b/include/rdma/rdma_cm_ib.h @@ -44,7 +44,7 @@ int rdma_set_ib_paths(struct rdma_cm_id *id, struct ib_sa_path_rec *path_rec, int num_paths); -/* Global qkey for UD QPs and multicast groups. */ -#define RDMA_UD_QKEY 0x01234567 +/* Global qkey for UDP QPs and multicast groups. */ +#define RDMA_UDP_QKEY 0x01234567 #endif /* RDMA_CM_IB_H */ |