b=14838

i=eeb
Landing Eric's patch

diff --git a/lnet/ChangeLog b/lnet/ChangeLog
index c508d16..af49f93 100644 (file)
--- a/lnet/ChangeLog
+++ b/lnet/ChangeLog
@@ -11,6 +11,10 @@ tbd  Sun Microsystems, Inc.
        gmlnd     - GM 2.1.22 and later,
        mxlnd     - MX 1.2.1 or later,
        ptllnd    - Portals 3.3 / UNICOS/lc 1.5.x, 2.0.x
+Severity   : normal
+Bugzilla   : 14838
+Description: ksocklnd fails to establish connection if accept_port is high
+Details    : PID remapping must not be done for active (outgoing) connections
 
 --------------------------------------------------------------------------------
 

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 41cb248..e642be5 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -2261,7 +2261,8 @@ ksocknal_recv_hello (lnet_ni_t *ni, ksock_conn_t *conn,
                 return -EPROTO;
         }
 
-        if (conn->ksnc_port > LNET_ACCEPTOR_MAX_RESERVED_PORT) {          
+        if (!active &&
+            conn->ksnc_port > LNET_ACCEPTOR_MAX_RESERVED_PORT) {          
                 /* Userspace NAL assigns peer process ID from socket */
                 recv_id.pid = conn->ksnc_port | LNET_PID_USERFLAG;
                 recv_id.nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), conn->ksnc_ipaddr);