git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
infiniband
/
core
/
smi.c
diff --git
a/drivers/infiniband/core/smi.c
b/drivers/infiniband/core/smi.c
index
35852e7
..
54b81e1
100644
(file)
--- a/
drivers/infiniband/core/smi.c
+++ b/
drivers/infiniband/core/smi.c
@@
-64,7
+64,7
@@
int smi_handle_dr_smp_send(struct ib_smp *smp,
/* C14-9:2 */
if (hop_ptr && hop_ptr < hop_cnt) {
/* C14-9:2 */
if (hop_ptr && hop_ptr < hop_cnt) {
- if (node_type !=
IB_NODE
_SWITCH)
+ if (node_type !=
RDMA_NODE_IB
_SWITCH)
return 0;
/* smp->return_path set when received */
return 0;
/* smp->return_path set when received */
@@
-77,7
+77,7
@@
int smi_handle_dr_smp_send(struct ib_smp *smp,
if (hop_ptr == hop_cnt) {
/* smp->return_path set when received */
smp->hop_ptr++;
if (hop_ptr == hop_cnt) {
/* smp->return_path set when received */
smp->hop_ptr++;
- return (node_type ==
IB_NODE
_SWITCH ||
+ return (node_type ==
RDMA_NODE_IB
_SWITCH ||
smp->dr_dlid == IB_LID_PERMISSIVE);
}
smp->dr_dlid == IB_LID_PERMISSIVE);
}
@@
-95,7
+95,7
@@
int smi_handle_dr_smp_send(struct ib_smp *smp,
/* C14-13:2 */
if (2 <= hop_ptr && hop_ptr <= hop_cnt) {
/* C14-13:2 */
if (2 <= hop_ptr && hop_ptr <= hop_cnt) {
- if (node_type !=
IB_NODE
_SWITCH)
+ if (node_type !=
RDMA_NODE_IB
_SWITCH)
return 0;
smp->hop_ptr--;
return 0;
smp->hop_ptr--;
@@
-107,7
+107,7
@@
int smi_handle_dr_smp_send(struct ib_smp *smp,
if (hop_ptr == 1) {
smp->hop_ptr--;
/* C14-13:3 -- SMPs destined for SM shouldn't be here */
if (hop_ptr == 1) {
smp->hop_ptr--;
/* C14-13:3 -- SMPs destined for SM shouldn't be here */
- return (node_type ==
IB_NODE
_SWITCH ||
+ return (node_type ==
RDMA_NODE_IB
_SWITCH ||
smp->dr_slid == IB_LID_PERMISSIVE);
}
smp->dr_slid == IB_LID_PERMISSIVE);
}
@@
-142,7
+142,7
@@
int smi_handle_dr_smp_recv(struct ib_smp *smp,
/* C14-9:2 -- intermediate hop */
if (hop_ptr && hop_ptr < hop_cnt) {
/* C14-9:2 -- intermediate hop */
if (hop_ptr && hop_ptr < hop_cnt) {
- if (node_type !=
IB_NODE
_SWITCH)
+ if (node_type !=
RDMA_NODE_IB
_SWITCH)
return 0;
smp->return_path[hop_ptr] = port_num;
return 0;
smp->return_path[hop_ptr] = port_num;
@@
-156,7
+156,7
@@
int smi_handle_dr_smp_recv(struct ib_smp *smp,
smp->return_path[hop_ptr] = port_num;
/* smp->hop_ptr updated when sending */
smp->return_path[hop_ptr] = port_num;
/* smp->hop_ptr updated when sending */
- return (node_type ==
IB_NODE
_SWITCH ||
+ return (node_type ==
RDMA_NODE_IB
_SWITCH ||
smp->dr_dlid == IB_LID_PERMISSIVE);
}
smp->dr_dlid == IB_LID_PERMISSIVE);
}
@@
-175,7
+175,7
@@
int smi_handle_dr_smp_recv(struct ib_smp *smp,
/* C14-13:2 */
if (2 <= hop_ptr && hop_ptr <= hop_cnt) {
/* C14-13:2 */
if (2 <= hop_ptr && hop_ptr <= hop_cnt) {
- if (node_type !=
IB_NODE
_SWITCH)
+ if (node_type !=
RDMA_NODE_IB
_SWITCH)
return 0;
/* smp->hop_ptr updated when sending */
return 0;
/* smp->hop_ptr updated when sending */
@@
-190,7
+190,7
@@
int smi_handle_dr_smp_recv(struct ib_smp *smp,
return 1;
}
/* smp->hop_ptr updated when sending */
return 1;
}
/* smp->hop_ptr updated when sending */
- return (node_type ==
IB_NODE
_SWITCH);
+ return (node_type ==
RDMA_NODE_IB
_SWITCH);
}
/* C14-13:4 -- hop_ptr = 0 -> give to SM */
}
/* C14-13:4 -- hop_ptr = 0 -> give to SM */