From f3e7d56a98cc4164846519a9a3fb52ae0eac60e8 Mon Sep 17 00:00:00 2001 From: green Date: Tue, 10 Feb 2004 22:12:57 +0000 Subject: [PATCH] Merge with HEAD --- lnet/klnds/socklnd/socklnd.h | 1 - lustre/portals/knals/socknal/socknal.h | 1 - 2 files changed, 2 deletions(-) diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h index 46cd0d8..0f0b9bd 100644 --- a/lnet/klnds/socklnd/socklnd.h +++ b/lnet/klnds/socklnd/socklnd.h @@ -334,7 +334,6 @@ typedef struct ksock_route int ksnr_port; /* port to connect to */ int ksnr_buffer_size; /* size of socket buffers */ unsigned int ksnr_irq_affinity:1; /* set affinity? */ - unsigned int ksnr_nonagel:1; /* disable nagle? */ unsigned int ksnr_eager:1; /* connect eagery? */ unsigned int ksnr_connecting:4; /* autoconnects in progress by type */ unsigned int ksnr_connected:4; /* connections established by type */ diff --git a/lustre/portals/knals/socknal/socknal.h b/lustre/portals/knals/socknal/socknal.h index 46cd0d8..0f0b9bd 100644 --- a/lustre/portals/knals/socknal/socknal.h +++ b/lustre/portals/knals/socknal/socknal.h @@ -334,7 +334,6 @@ typedef struct ksock_route int ksnr_port; /* port to connect to */ int ksnr_buffer_size; /* size of socket buffers */ unsigned int ksnr_irq_affinity:1; /* set affinity? */ - unsigned int ksnr_nonagel:1; /* disable nagle? */ unsigned int ksnr_eager:1; /* connect eagery? */ unsigned int ksnr_connecting:4; /* autoconnects in progress by type */ unsigned int ksnr_connected:4; /* connections established by type */ -- 1.8.3.1