From 0c77b0ac37834a88cc212ac3ca185200583f4323 Mon Sep 17 00:00:00 2001 From: ftillier Date: Fri, 4 Aug 2006 08:39:21 +0000 Subject: [PATCH] [IPoIB] Remove unused parameters Submitted by: Guy Corem (guyc@voltaire.com) git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@441 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- ulp/ipoib/kernel/ipoib_adapter.h | 3 --- ulp/ipoib/kernel/ipoib_driver.c | 33 -------------------------------- ulp/ipoib/kernel/netipoib.inf | 22 --------------------- 3 files changed, 58 deletions(-) diff --git a/ulp/ipoib/kernel/ipoib_adapter.h b/ulp/ipoib/kernel/ipoib_adapter.h index 43601a04..23e54af6 100644 --- a/ulp/ipoib/kernel/ipoib_adapter.h +++ b/ulp/ipoib/kernel/ipoib_adapter.h @@ -67,12 +67,9 @@ typedef struct _ipoib_params int32_t sq_depth; boolean_t send_chksum_offload; boolean_t recv_chksum_offload; - boolean_t wsdp_enabled; - uint16_t static_lid; uint32_t sa_timeout; uint32_t sa_retry_cnt; uint32_t recv_pool_ratio; - boolean_t recv_growth; mac_addr_t conf_mac; } ipoib_params_t; diff --git a/ulp/ipoib/kernel/ipoib_driver.c b/ulp/ipoib/kernel/ipoib_driver.c index 521c1265..d791243d 100644 --- a/ulp/ipoib/kernel/ipoib_driver.c +++ b/ulp/ipoib/kernel/ipoib_driver.c @@ -48,12 +48,6 @@ #include -/* Default parameters values for optional parameters */ -#define DEF_WSDP_ENABLED FALSE -#define DEF_STATIC_LID 0 -#define DEF_RECV_GROWTH 0 - - #if defined(NDIS50_MINIPORT) #define MAJOR_NDIS_VERSION 5 #define MINOR_NDIS_VERSION 0 @@ -495,24 +489,6 @@ ipoib_get_adapter_params( } p_adapter->params.recv_chksum_offload = (p_param->ParameterData.IntegerData != 0); - /* Optional: WSDP support. */ - RtlInitUnicodeString( &keyword, L"WsdpEnabled" ); - NdisReadConfiguration( - &status, &p_param, h_config, &keyword, NdisParameterInteger ); - if( status != NDIS_STATUS_SUCCESS ) - p_adapter->params.wsdp_enabled = DEF_WSDP_ENABLED; - else - p_adapter->params.wsdp_enabled = (p_param->ParameterData.IntegerData != 0); - - /* Optional: Static LID assignment if SM is not up. */ - RtlInitUnicodeString( &keyword, L"StaticLid" ); - NdisReadConfiguration( - &status, &p_param, h_config, &keyword, NdisParameterInteger ); - if( status != NDIS_STATUS_SUCCESS ) - p_adapter->params.static_lid = DEF_STATIC_LID; - else - p_adapter->params.static_lid = (uint16_t)p_param->ParameterData.IntegerData; - /* Required: SA query timeout, in milliseconds. */ RtlInitUnicodeString( &keyword, L"SaTimeout" ); NdisReadConfiguration( @@ -549,15 +525,6 @@ ipoib_get_adapter_params( } p_adapter->params.recv_pool_ratio = p_param->ParameterData.IntegerData; - /* Required: Receive pool growth threshold. */ - RtlInitUnicodeString( &keyword, L"RecvGrowth" ); - NdisReadConfiguration( - &status, &p_param, h_config, &keyword, NdisParameterInteger ); - if( status != NDIS_STATUS_SUCCESS ) - p_adapter->params.recv_growth = DEF_RECV_GROWTH; - else - p_adapter->params.recv_growth = (p_param->ParameterData.IntegerData != 0); - NdisReadNetworkAddress( &status, &mac, &len, h_config ); ETH_COPY_NETWORK_ADDRESS( p_adapter->params.conf_mac.addr, p_adapter->mac.addr ); diff --git a/ulp/ipoib/kernel/netipoib.inf b/ulp/ipoib/kernel/netipoib.inf index a83f1385..23891028 100644 --- a/ulp/ipoib/kernel/netipoib.inf +++ b/ulp/ipoib/kernel/netipoib.inf @@ -98,20 +98,6 @@ HKR, Ndi\Params\RecvChksum, Optional, 0, "0" HKR, Ndi\Params\RecvChksum\enum, "0", 0, "Disabled" HKR, Ndi\Params\RecvChksum\enum, "1", 0, "Enabled" -HKR, Ndi\Params\WsdpEnabled, ParamDesc, 0, "WSDP Support" -HKR, Ndi\Params\WsdpEnabled, Type, 0, "enum" -HKR, Ndi\Params\WsdpEnabled, Default, 0, "0" -HKR, Ndi\Params\WsdpEnabled, Optional, 0, "1" -HKR, Ndi\Params\WsdpEnabled\enum, "0", 0, "Disabled" -HKR, Ndi\Params\WsdpEnabled\enum, "1", 0, "Enabled" - -HKR, Ndi\Params\SaRetries, ParamDesc, 0, "Static LID" -HKR, Ndi\Params\SaRetries, Type, 0, "word" -HKR, Ndi\Params\SaRetries, Default, 0, "1" -HKR, Ndi\Params\SaRetries, Optional, 0, "1" -HKR, Ndi\Params\SaRetries, Min, 0, "1" -HKR, Ndi\Params\SaRetries, Max, 0, "65535" - HKR, Ndi\Params\SaTimeout, ParamDesc, 0, "SA Query Timeout (ms)" HKR, Ndi\Params\SaTimeout, Type, 0, "dword" HKR, Ndi\Params\SaTimeout, Default, 0, "1000" @@ -132,14 +118,6 @@ HKR, Ndi\Params\RecvRatio, Optional, 0, "0" HKR, Ndi\Params\RecvRatio, Min, 0, "1" HKR, Ndi\Params\RecvRatio, Max, 0, "10" -HKR, Ndi\Params\RecvGrowth, ParamDesc, 0, "Receive Pool Growth" -HKR, Ndi\Params\RecvGrowth, Type, 0, "enum" -HKR, Ndi\Params\RecvGrowth, Default, 0, "1" -HKR, Ndi\Params\RecvGrowth, Optional, 0, "1" -HKR, Ndi\Params\RecvGrowth\enum, "0", 0, "Disabled" -HKR, Ndi\Params\RecvGrowth\enum, "1", 0, "Enabled" - - [IpoibService] DisplayName = %IpoibServiceDispName% ServiceType = 1 ;%SERVICE_KERNEL_DRIVER% -- 2.17.1