b=20079

i=isaac
i=liang
Minor bugfix of usocklnd - calling usocklnd_assign_ni_nid unconditionally
(both for user-mode and server-mode cases) to let lnet layer know our
actual nid.

diff --git a/lnet/ulnds/socklnd/usocklnd.c b/lnet/ulnds/socklnd/usocklnd.c
index a280d3b..0b887c3 100644 (file)
--- a/lnet/ulnds/socklnd/usocklnd.c
+++ b/lnet/ulnds/socklnd/usocklnd.c
@@ -465,11 +465,9 @@ usocklnd_startup(lnet_ni_t *ni)
 
         ni->ni_data = net;
 
 
         ni->ni_data = net;
 

-        if (!(the_lnet.ln_pid & LNET_PID_USERFLAG)) {
-                rc = usocklnd_assign_ni_nid(ni);
-                if (rc != 0)
-                        goto startup_failed_1;
-        }
+        rc = usocklnd_assign_ni_nid(ni);
+        if (rc != 0)
+                goto startup_failed_1;

 
         LASSERT (ni->ni_lnd == &the_tcplnd);
 
 
         LASSERT (ni->ni_lnd == &the_tcplnd);