Update b_orphan from HEAD (20040130_1601) in preparation for landing.

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 985b432..45a1508 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -2271,7 +2271,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
                 goto out;
         }
 
-        if (route->ksnr_nonagel) {
+        {
                 int  option = 1;
                 
                 set_fs (KERNEL_DS);
@@ -2279,7 +2279,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
                                             (char *)&option, sizeof (option));
                 set_fs (oldmm);
                 if (rc != 0) {
-                        CERROR ("Can't disable nagel: %d\n", rc);
+                        CERROR ("Can't disable nagle: %d\n", rc);
                         goto out;
                 }
         }

diff --git a/lustre/portals/knals/socknal/socknal_cb.c b/lustre/portals/knals/socknal/socknal_cb.c
index 985b432..45a1508 100644 (file)
--- a/lustre/portals/knals/socknal/socknal_cb.c
+++ b/lustre/portals/knals/socknal/socknal_cb.c
@@ -2271,7 +2271,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
                 goto out;
         }
 
-        if (route->ksnr_nonagel) {
+        {
                 int  option = 1;
                 
                 set_fs (KERNEL_DS);
@@ -2279,7 +2279,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
                                             (char *)&option, sizeof (option));
                 set_fs (oldmm);
                 if (rc != 0) {
-                        CERROR ("Can't disable nagel: %d\n", rc);
+                        CERROR ("Can't disable nagle: %d\n", rc);
                         goto out;
                 }
         }