b=16133

[fs/lustre-release.git] / lnet / klnds / mxlnd / mxlnd_cb.c

diff --git a/lnet/klnds/mxlnd/mxlnd_cb.c b/lnet/klnds/mxlnd/mxlnd_cb.c
index f603a6e..2b8b32a 100644 (file)
--- a/lnet/klnds/mxlnd/mxlnd_cb.c
+++ b/lnet/klnds/mxlnd/mxlnd_cb.c
@@ -1,5 +1,4 @@
-/*
- * -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
  * GPL HEADER START
@@ -17,8 +16,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -855,7 +854,7 @@ mxlnd_pack_msg(struct kmx_ctx *tx)
         }
         /*   mxm_nob */
         msg->mxm_cksum    = 0;
-        msg->mxm_srcnid   = lnet_ptlcompat_srcnid(kmxlnd_data.kmx_ni->ni_nid, tx->mxc_nid);
+        msg->mxm_srcnid   = kmxlnd_data.kmx_ni->ni_nid;
         msg->mxm_srcstamp = kmxlnd_data.kmx_incarnation;
         msg->mxm_dstnid   = tx->mxc_nid;
         /* if it is a new peer, the dststamp will be 0 */
@@ -2924,8 +2923,8 @@ mxlnd_handle_rx_completion(struct kmx_ctx *rx)
         seq = msg->mxm_seq;
 
         if (type != MXLND_MSG_CONN_REQ &&
-            (!lnet_ptlcompat_matchnid(rx->mxc_nid, msg->mxm_srcnid) ||
-             !lnet_ptlcompat_matchnid(kmxlnd_data.kmx_ni->ni_nid, msg->mxm_dstnid))) {
+            (rx->mxc_nid != msg->mxm_srcnid ||
+             kmxlnd_data.kmx_ni->ni_nid != msg->mxm_dstnid)) {
                 CDEBUG(D_NETERROR, "rx with mismatched NID (type %s) (my nid is "
                        "0x%llx and rx msg dst is 0x%llx)\n",
                        mxlnd_msgtype_to_str(type), kmxlnd_data.kmx_ni->ni_nid,
@@ -3016,7 +3015,7 @@ mxlnd_handle_rx_completion(struct kmx_ctx *rx)
                 break;
 
         case MXLND_MSG_CONN_REQ:
-                if (!lnet_ptlcompat_matchnid(kmxlnd_data.kmx_ni->ni_nid, msg->mxm_dstnid)) {
+                if (kmxlnd_data.kmx_ni->ni_nid != msg->mxm_dstnid) {
                         CDEBUG(D_NETERROR, "Can't accept %s: bad dst nid %s\n",
                                         libcfs_nid2str(msg->mxm_srcnid),
                                         libcfs_nid2str(msg->mxm_dstnid));
@@ -3114,7 +3113,7 @@ mxlnd_handle_rx_completion(struct kmx_ctx *rx)
                 break;
 
         case MXLND_MSG_CONN_ACK:
-                if (!lnet_ptlcompat_matchnid(kmxlnd_data.kmx_ni->ni_nid, msg->mxm_dstnid)) {
+                if (kmxlnd_data.kmx_ni->ni_nid != msg->mxm_dstnid) {
                         CDEBUG(D_NETERROR, "Can't accept CONN_ACK from %s: "
                                "bad dst nid %s\n", libcfs_nid2str(msg->mxm_srcnid),
                                 libcfs_nid2str(msg->mxm_dstnid));