- 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 b422c3f..f329e2a 100644 (file)
--- a/lnet/ulnds/address.c
+++ b/lnet/ulnds/address.c
@@ -3,19 +3,19 @@
  *
  *  Copyright (c) 2002 Cray Inc.
  *
  *
  *  Copyright (c) 2002 Cray Inc.
  *

- *   This file is part of Portals, http://www.sf.net/projects/sandiaportals/
+ *   This file is part of Lustre, http://www.lustre.org.

  *
  *

- *   Portals is free software; you can redistribute it and/or
- *   modify it under the terms of version 2.1 of the GNU Lesser General
- *   Public License as published by the Free Software Foundation.
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.

  *
  *

- *   Portals is distributed in the hope that it will be useful,
+ *   Lustre is distributed in the hope that it will be useful,

  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *   GNU Lesser General Public License for more details.
+ *   GNU General Public License for more details.

  *
  *

- *   You should have received a copy of the GNU Lesser General Public
- *   License along with Portals; if not, write to the Free Software
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software

  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 


@@ -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