[IPoIB] Remove unused parameters

Submitted by: Guy Corem (guyc@voltaire.com)

git-svn-id: svn://openib.tc.cornell.edu/gen1@441 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/ulp/ipoib/kernel/ipoib_adapter.h b/trunk/ulp/ipoib/kernel/ipoib_adapter.h
index 43601a046e2cdbe676849809c8bba73a31186d32..23e54af645bdeae9dc72b2f5b654decc7ea92a1c 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_adapter.h
+++ b/trunk/ulp/ipoib/kernel/ipoib_adapter.h
@@ -67,12 +67,9 @@ typedef struct _ipoib_params
        int32_t         sq_depth;\r
        boolean_t       send_chksum_offload;\r
        boolean_t       recv_chksum_offload;\r
-       boolean_t       wsdp_enabled;\r
-       uint16_t        static_lid;\r
        uint32_t        sa_timeout;\r
        uint32_t        sa_retry_cnt;\r
        uint32_t        recv_pool_ratio;\r
-       boolean_t       recv_growth;\r
        mac_addr_t      conf_mac;\r
 \r
 }      ipoib_params_t;\r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_driver.c b/trunk/ulp/ipoib/kernel/ipoib_driver.c
index 521c126502ef54845f28b8508d8fd7644552b461..d791243d922345bd6117b94774d73d8b22ab2c34 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_driver.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_driver.c
@@ -48,12 +48,6 @@
 #include <iba/ipoib_ifc.h>\r
 \r
 \r
-/* Default parameters values for optional parameters */\r
-#define DEF_WSDP_ENABLED       FALSE\r
-#define DEF_STATIC_LID         0\r
-#define DEF_RECV_GROWTH                0\r
-\r
-\r
 #if defined(NDIS50_MINIPORT)\r
 #define MAJOR_NDIS_VERSION 5\r
 #define MINOR_NDIS_VERSION 0\r
@@ -495,24 +489,6 @@ ipoib_get_adapter_params(
        }\r
        p_adapter->params.recv_chksum_offload = (p_param->ParameterData.IntegerData != 0);\r
 \r
-       /* Optional: WSDP support. */\r
-       RtlInitUnicodeString( &keyword, L"WsdpEnabled" );\r
-       NdisReadConfiguration(\r
-               &status, &p_param, h_config, &keyword, NdisParameterInteger );\r
-       if( status != NDIS_STATUS_SUCCESS )\r
-               p_adapter->params.wsdp_enabled = DEF_WSDP_ENABLED;\r
-       else\r
-               p_adapter->params.wsdp_enabled = (p_param->ParameterData.IntegerData != 0);\r
-\r
-       /* Optional: Static LID assignment if SM is not up. */\r
-       RtlInitUnicodeString( &keyword, L"StaticLid" );\r
-       NdisReadConfiguration(\r
-               &status, &p_param, h_config, &keyword, NdisParameterInteger );\r
-       if( status != NDIS_STATUS_SUCCESS )\r
-               p_adapter->params.static_lid = DEF_STATIC_LID;\r
-       else\r
-               p_adapter->params.static_lid = (uint16_t)p_param->ParameterData.IntegerData;\r
-\r
        /* Required: SA query timeout, in milliseconds. */\r
        RtlInitUnicodeString( &keyword, L"SaTimeout" );\r
        NdisReadConfiguration(\r
@@ -549,15 +525,6 @@ ipoib_get_adapter_params(
        }\r
        p_adapter->params.recv_pool_ratio = p_param->ParameterData.IntegerData;\r
 \r
-       /* Required: Receive pool growth threshold. */\r
-       RtlInitUnicodeString( &keyword, L"RecvGrowth" );\r
-       NdisReadConfiguration(\r
-               &status, &p_param, h_config, &keyword, NdisParameterInteger );\r
-       if( status != NDIS_STATUS_SUCCESS )\r
-               p_adapter->params.recv_growth = DEF_RECV_GROWTH;\r
-       else\r
-               p_adapter->params.recv_growth = (p_param->ParameterData.IntegerData != 0);\r
-\r
        NdisReadNetworkAddress( &status, &mac, &len, h_config );\r
 \r
        ETH_COPY_NETWORK_ADDRESS( p_adapter->params.conf_mac.addr, p_adapter->mac.addr );\r

diff --git a/trunk/ulp/ipoib/kernel/netipoib.inf b/trunk/ulp/ipoib/kernel/netipoib.inf
index a83f138522f631962e248b1e67293d0cff953fe0..2389102895d09934e72f7ed07183087b9ccbe7dd 100644 (file)
--- a/trunk/ulp/ipoib/kernel/netipoib.inf
+++ b/trunk/ulp/ipoib/kernel/netipoib.inf
@@ -98,20 +98,6 @@ HKR, Ndi\Params\RecvChksum,          Optional,       0, "0"
 HKR, Ndi\Params\RecvChksum\enum,       "0",    0, "Disabled"\r
 HKR, Ndi\Params\RecvChksum\enum,       "1",    0, "Enabled"\r
 \r
-HKR, Ndi\Params\WsdpEnabled,   ParamDesc,      0, "WSDP Support"\r
-HKR, Ndi\Params\WsdpEnabled,   Type,           0, "enum"\r
-HKR, Ndi\Params\WsdpEnabled,   Default,        0, "0"\r
-HKR, Ndi\Params\WsdpEnabled,   Optional,       0, "1"\r
-HKR, Ndi\Params\WsdpEnabled\enum,      "0",    0, "Disabled"\r
-HKR, Ndi\Params\WsdpEnabled\enum,      "1",    0, "Enabled"\r
-\r
-HKR, Ndi\Params\SaRetries,             ParamDesc,      0, "Static LID"\r
-HKR, Ndi\Params\SaRetries,             Type,           0, "word"\r
-HKR, Ndi\Params\SaRetries,             Default,        0, "1"\r
-HKR, Ndi\Params\SaRetries,             Optional,       0, "1"\r
-HKR, Ndi\Params\SaRetries,             Min,            0, "1"\r
-HKR, Ndi\Params\SaRetries,             Max,            0, "65535"\r
-\r
 HKR, Ndi\Params\SaTimeout,             ParamDesc,      0, "SA Query Timeout (ms)"\r
 HKR, Ndi\Params\SaTimeout,             Type,           0, "dword"\r
 HKR, Ndi\Params\SaTimeout,             Default,        0, "1000"\r
@@ -132,14 +118,6 @@ HKR, Ndi\Params\RecvRatio,         Optional,       0, "0"
 HKR, Ndi\Params\RecvRatio,             Min,            0, "1"\r
 HKR, Ndi\Params\RecvRatio,             Max,            0, "10"\r
 \r
-HKR, Ndi\Params\RecvGrowth,            ParamDesc,      0, "Receive Pool Growth"\r
-HKR, Ndi\Params\RecvGrowth,            Type,           0, "enum"\r
-HKR, Ndi\Params\RecvGrowth,            Default,        0, "1"\r
-HKR, Ndi\Params\RecvGrowth,            Optional,       0, "1"\r
-HKR, Ndi\Params\RecvGrowth\enum,       "0",    0, "Disabled"\r
-HKR, Ndi\Params\RecvGrowth\enum,       "1",    0, "Enabled"\r
-\r
-\r
 [IpoibService]\r
 DisplayName     = %IpoibServiceDispName%\r
 ServiceType     = 1 ;%SERVICE_KERNEL_DRIVER%\r