* moved lonal into portals module

diff --git a/lnet/klnds/Makefile.in b/lnet/klnds/Makefile.in
index f494a30..7b2a121 100644 (file)
--- a/lnet/klnds/Makefile.in
+++ b/lnet/klnds/Makefile.in
@@ -5,6 +5,5 @@
 @BUILD_VIBNAL_TRUE@subdir-m += vibnal
 @BUILD_QSWNAL_TRUE@subdir-m += qswnal
 subdir-m += socknal
-subdir-m += lonal
 
 @INCLUDE_RULES@

diff --git a/lnet/klnds/autoMakefile.am b/lnet/klnds/autoMakefile.am
index d28e365..d466e25 100644 (file)
--- a/lnet/klnds/autoMakefile.am
+++ b/lnet/klnds/autoMakefile.am
@@ -3,4 +3,4 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-SUBDIRS = lonal socknal qswnal gmnal openibnal iibnal vibnal ranal
+SUBDIRS = socknal qswnal gmnal openibnal iibnal vibnal ranal

diff --git a/lnet/klnds/qswlnd/qswlnd_cb.c b/lnet/klnds/qswlnd/qswlnd_cb.c
index f0c2793..2042d39 100644 (file)
--- a/lnet/klnds/qswlnd/qswlnd_cb.c
+++ b/lnet/klnds/qswlnd/qswlnd_cb.c
@@ -1499,7 +1499,7 @@ kqswnal_parse (kqswnal_rx_t *krx)
 
         LASSERT (atomic_read(&krx->krx_refcount) == 1);
 
-        if (dest_nid == kqswnal_data.kqn_ni->ni_nid) { /* It's for me :) */
+        if (ptl_islocalnid(dest_nid)) {         /* It's for me :) */
                 /* I ignore parse errors since I'm not consuming a byte
                  * stream */
                 (void)ptl_parse (kqswnal_data.kqn_ni, hdr, krx);

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index c6fc466..760f2e9 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -1313,8 +1313,7 @@ ksocknal_process_receive (ksock_conn_t *conn)
         switch (conn->ksnc_rx_state) {
         case SOCKNAL_RX_HEADER:
                 if (conn->ksnc_hdr.type != cpu_to_le32(PTL_MSG_HELLO) &&
-                    le64_to_cpu(conn->ksnc_hdr.dest_nid) != 
-                    conn->ksnc_peer->ksnp_ni->ni_nid) {
+                    !ptl_islocalnid(le64_to_cpu(conn->ksnc_hdr.dest_nid))) {
                         /* This packet isn't for me */
                         ksocknal_fwd_parse (conn);
                         switch (conn->ksnc_rx_state) {