diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:43:09 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:43:09 -0400 |
commit | a7144b23da073f4b3192e356ad74de12aba60e00 (patch) | |
tree | 2b93bdf54563bfe447a167d832c43d24f56c7a95 /drivers/infiniband/include/ib_cm.h | |
parent | 8a60a07129fad60bba779a2a4038c7518b167fc7 (diff) | |
parent | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff) | |
download | talos-op-linux-a7144b23da073f4b3192e356ad74de12aba60e00.tar.gz talos-op-linux-a7144b23da073f4b3192e356ad74de12aba60e00.zip |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/infiniband/include/ib_cm.h')
-rw-r--r-- | drivers/infiniband/include/ib_cm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/include/ib_cm.h b/drivers/infiniband/include/ib_cm.h index e5d74a730a70..da650115e79a 100644 --- a/drivers/infiniband/include/ib_cm.h +++ b/drivers/infiniband/include/ib_cm.h @@ -169,7 +169,8 @@ enum ib_cm_rej_reason { IB_CM_REJ_INVALID_ALT_TRAFFIC_CLASS = __constant_htons(21), IB_CM_REJ_INVALID_ALT_HOP_LIMIT = __constant_htons(22), IB_CM_REJ_INVALID_ALT_PACKET_RATE = __constant_htons(23), - IB_CM_REJ_PORT_REDIRECT = __constant_htons(24), + IB_CM_REJ_PORT_CM_REDIRECT = __constant_htons(24), + IB_CM_REJ_PORT_REDIRECT = __constant_htons(25), IB_CM_REJ_INVALID_MTU = __constant_htons(26), IB_CM_REJ_INSUFFICIENT_RESP_RESOURCES = __constant_htons(27), IB_CM_REJ_CONSUMER_DEFINED = __constant_htons(28), |