LU-12477 lnet: Remove obsolete config options

[fs/lustre-release.git] / lnet / klnds / socklnd / socklnd_modparams.c

diff --git a/lnet/klnds/socklnd/socklnd_modparams.c b/lnet/klnds/socklnd/socklnd_modparams.c
index 6495703..046436f 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_modparams.c
+++ b/lnet/klnds/socklnd/socklnd_modparams.c
@@ -37,7 +37,7 @@ static int peer_buffer_credits;
 module_param(peer_buffer_credits, int, 0444);
 MODULE_PARM_DESC(peer_buffer_credits, "# per-peer router buffer credits");
 
-static int peer_timeout = 180;
+static int peer_timeout = DEFAULT_PEER_TIMEOUT;
 module_param(peer_timeout, int, 0444);
 MODULE_PARM_DESC(peer_timeout, "Seconds without aliveness news to declare peer dead (<=0 to disable)");
 
@@ -117,11 +117,9 @@ static int inject_csum_error = 0;
 module_param(inject_csum_error, int, 0644);
 MODULE_PARM_DESC(inject_csum_error, "set non-zero to inject a checksum error");
 
-#ifdef CPU_AFFINITY
 static int enable_irq_affinity = 0;
 module_param(enable_irq_affinity, int, 0644);
 MODULE_PARM_DESC(enable_irq_affinity, "enable IRQ affinity");
-#endif
 
 static int nonblk_zcack = 1;
 module_param(nonblk_zcack, int, 0644);
@@ -155,7 +153,7 @@ module_param(protocol, int, 0644);
 MODULE_PARM_DESC(protocol, "protocol version");
 #endif
 
-ksock_tunables_t ksocknal_tunables;
+struct ksock_tunables ksocknal_tunables;
 
 int ksocknal_tunables_init(void)
 {
@@ -189,7 +187,6 @@ int ksocknal_tunables_init(void)
         ksocknal_tunables.ksnd_zc_recv            = &zc_recv;
         ksocknal_tunables.ksnd_zc_recv_min_nfrags = &zc_recv_min_nfrags;
 
-#ifdef CPU_AFFINITY
        if (enable_irq_affinity) {
                CWARN("irq_affinity is removed from socklnd because modern "
                      "computer always has fast CPUs and more cores than "
@@ -197,7 +194,6 @@ int ksocknal_tunables_init(void)
                      "another way, please check manual for details.\n");
        }
         ksocknal_tunables.ksnd_irq_affinity       = &enable_irq_affinity;
-#endif
 
 #ifdef SOCKNAL_BACKOFF
         ksocknal_tunables.ksnd_backoff_init       = &backoff_init;