Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- landing of b_hd_cleanup_merge to HEAD.
[fs/lustre-release.git]
/
lnet
/
ulnds
/
address.c
diff --git
a/lnet/ulnds/address.c
b/lnet/ulnds/address.c
index
6507924
..
f329e2a
100644
(file)
--- a/
lnet/ulnds/address.c
+++ b/
lnet/ulnds/address.c
@@
-91,8
+91,8
@@
void set_address(bridge t,ptl_pid_t pidrequest)
int port;
if (pidrequest==(unsigned short)PTL_PID_ANY) port = 0;
else port=pidrequest;
int port;
if (pidrequest==(unsigned short)PTL_PID_ANY) port = 0;
else port=pidrequest;
- t->
nal_cb->ni
.nid=get_node_id();
- t->
nal_cb->ni
.pid=port;
+ t->
lib_nal->libnal_ni.ni_pid
.nid=get_node_id();
+ t->
lib_nal->libnal_ni.ni_pid
.pid=port;
}
#else
}
#else
@@
-120,10
+120,9
@@
void set_address(bridge t,ptl_pid_t pidrequest)
in_addr = get_node_id();
t->iptop8 = in_addr >> PNAL_HOSTID_SHIFT;/* for making new connections */
in_addr = get_node_id();
t->iptop8 = in_addr >> PNAL_HOSTID_SHIFT;/* for making new connections */
- t->nal_cb->ni.nid = ((in_addr & PNAL_HOSTID_MASK)
- << PNAL_VNODE_SHIFT)
- + virtnode;
-
+ t->lib_nal->libnal_ni.ni_pid.nid = ((in_addr & PNAL_HOSTID_MASK)
+ << PNAL_VNODE_SHIFT)
+ + virtnode;
pid=pidrequest;
/* TODO: Support of pid PTL_ID_ANY with virtual nodes needs more work. */
#ifdef notyet
pid=pidrequest;
/* TODO: Support of pid PTL_ID_ANY with virtual nodes needs more work. */
#ifdef notyet
@@
-141,6
+140,6
@@
void set_address(bridge t,ptl_pid_t pidrequest)
return;
}
else port = ((virtnode << PNAL_VNODE_SHIFT) + pid) + PNAL_BASE_PORT;
return;
}
else port = ((virtnode << PNAL_VNODE_SHIFT) + pid) + PNAL_BASE_PORT;
- t->
nal_cb->ni
.pid=pid;
+ t->
lib_nal->libnal_ni.ni_pid
.pid=pid;
}
#endif
}
#endif