[IPOIB] A work around for working with 1.8.x opensm. (off by default)

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

diff --git a/trunk/ulp/ipoib/kernel/ipoib_driver.c b/trunk/ulp/ipoib/kernel/ipoib_driver.c
index 3e959640c4524d0e188f969481e5952f681977ad..08e9e85b0b82fada38f3945796656eec8a0ca018 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_driver.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_driver.c
@@ -321,7 +321,7 @@ __ipoib_read_registry(
 {\r
        NTSTATUS                                                status;\r
        /* Remember the terminating entry in the table below. */\r
-       RTL_QUERY_REGISTRY_TABLE                table[3];\r
+       RTL_QUERY_REGISTRY_TABLE                table[4];\r
        UNICODE_STRING                                  param_path;\r
 \r
        IPOIB_ENTER( IPOIB_DBG_INIT );\r
@@ -360,6 +360,13 @@ __ipoib_read_registry(
        table[1].DefaultData = &g_ipoib_dbg_flags;\r
        table[1].DefaultLength = sizeof(ULONG);\r
 \r
+       table[2].Flags = RTL_QUERY_REGISTRY_DIRECT;\r
+       table[2].Name = L"bypass_check_bcast_rate";\r
+       table[2].EntryContext = &g_ipoib.bypass_check_bcast_rate;\r
+       table[2].DefaultType = REG_DWORD;\r
+       table[2].DefaultData = &g_ipoib.bypass_check_bcast_rate;\r
+       table[2].DefaultLength = sizeof(ULONG);\r
+\r
        /* Have at it! */\r
        status = RtlQueryRegistryValues( RTL_REGISTRY_ABSOLUTE, \r
                param_path.Buffer, table, NULL, NULL );\r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_driver.h b/trunk/ulp/ipoib/kernel/ipoib_driver.h
index a96ebb1279f99aff95934e7869b1d3d988e2b9ad..ee4f588800960b59ed57c3fd8960e05085f40ee1 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_driver.h
+++ b/trunk/ulp/ipoib/kernel/ipoib_driver.h
@@ -73,6 +73,7 @@ typedef struct _ipoib_globals
        NDIS_HANDLE             h_ndis_wrapper;\r
        NDIS_HANDLE             h_ibat_dev;\r
        volatile LONG   ibat_ref;\r
+       uint32_t                bypass_check_bcast_rate;\r
 \r
 }      ipoib_globals_t;\r
 /*\r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_port.c b/trunk/ulp/ipoib/kernel/ipoib_port.c
index 640d3a470f98750848f718d17b42e2f2e8e1ff22..75f881f44c63d0d4297db98b50e0ff65b720c879 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_port.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_port.c
@@ -4809,7 +4809,8 @@ __port_join_bcast(
        IPOIB_ENTER( IPOIB_DBG_MCAST );\r
 \r
        /* Check that the rate is realizable for our port. */\r
-       if( p_port->ib_mgr.rate < (p_member_rec->rate & 0x3F) )\r
+       if( p_port->ib_mgr.rate < (p_member_rec->rate & 0x3F) &&\r
+               (g_ipoib.bypass_check_bcast_rate == 0))\r
        {\r
                /*\r
                 * The MC group rate is higher than our port's rate.  Log an error\r
@@ -5222,6 +5223,8 @@ ipoib_port_join_mcast(
        mcast_req.member_rec = p_port->ib_mgr.bcast_rec;\r
        /* Clear fields that aren't specified in the join */\r
        mcast_req.member_rec.mlid = 0;\r
+       mcast_req.member_rec.mtu = 0;\r
+       mcast_req.member_rec.rate = 0;  \r
 \r
        if( mac.addr[0] == 1 && mac.addr[1] == 0 && mac.addr[2] == 0x5E )\r
        {\r

diff --git a/trunk/ulp/ipoib/kernel/netipoib.inf b/trunk/ulp/ipoib/kernel/netipoib.inf
index f3f659e19c5d21b1ba607d7445318ab47ebb2cac..ee31567c90179706b4afb88de3e5680392d8648e 100644 (file)
--- a/trunk/ulp/ipoib/kernel/netipoib.inf
+++ b/trunk/ulp/ipoib/kernel/netipoib.inf
@@ -152,6 +152,7 @@ AddReg          = Ipoib.ParamsReg
 [Ipoib.ParamsReg]\r
 HKR,"Parameters","DebugLevel",%REG_DWORD_NO_CLOBBER%,0x00000002\r
 HKR,"Parameters","DebugFlags",%REG_DWORD_NO_CLOBBER%,0x00000fff\r
+HKR,"Parameters","bypass_check_bcast_rate",%REG_DWORD_NO_CLOBBER%,0x00000000\r
 \r
 [IpoibEventLog]\r
 AddReg = IpoibAddEventLogReg\r