[IPoIB NDIS 6.0 CM] Fixing a bug when ipoib_get_adapter_params fails reading paramete...

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

diff --git a/trunk/ulp/ipoib/kernel/ipoib_stat.h b/trunk/ulp/ipoib/kernel/ipoib_stat.h
index 7e601bba52730fe8c0b7fae3e27424faaf9d0296..6f1d1877c0034d9d4f55b5e4474636699a821313 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_stat.h
+++ b/trunk/ulp/ipoib/kernel/ipoib_stat.h
@@ -42,7 +42,7 @@ typedef struct _IPOIB_ST_DEVICE
        boolean_t                       valid;\r
        ipoib_adapter_t         *p_adapter;\r
        ipoib_port_t            *p_prev_port;\r
-       PRKTHREAD                       *p_halt_thread;\r
+       PRKTHREAD                       p_halt_thread;\r
        int                                     n_power_irps;   // NdisDevicePnPEventPowerProfileChanged \r
        int                                     n_pnp_irps;             // NdisDevicePnPEventSurpriseRemoved \r
        \r

diff --git a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_adapter.cpp b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_adapter.cpp
index c1a8b74d26e8a1ce6cbcce9ec0f904bd5e0e7315..c87ef53b7c851fe8e8c6cb075e72606e8352cdf3 100644 (file)
--- a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_adapter.cpp
+++ b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_adapter.cpp
@@ -197,7 +197,7 @@ ipoib_create_adapter(
 \r
        ETH_COPY_NETWORK_ADDRESS( p_adapter->params.conf_mac.addr, p_adapter->mac.addr );\r
        /* If there is a NetworkAddress override in registry, use it */\r
-       if( (status == NDIS_STATUS_SUCCESS) && (len == HW_ADDR_LEN) )\r
+       if( (len == HW_ADDR_LEN) && (mac != NULL) )\r
        {\r
                if( ETH_IS_MULTICAST(mac) || ETH_IS_BROADCAST(mac) ||\r
                        !ETH_IS_LOCALLY_ADMINISTERED(mac) )\r
@@ -666,8 +666,8 @@ __ipoib_pnp_cb(
                }\r
 \r
                p_pnp_rec->context = p_port;\r
-\r
-               p_adapter->p_stat->p_prev_port = p_adapter->p_port;\r
+               if ( p_adapter->p_stat )\r
+                       p_adapter->p_stat->p_prev_port = p_adapter->p_port;\r
                p_adapter->p_port = p_port;\r
                cl_obj_unlock( &p_adapter->obj );\r
                break;\r
@@ -685,7 +685,8 @@ __ipoib_pnp_cb(
 \r
                cl_obj_lock( &p_adapter->obj );\r
                p_adapter->state = IB_PNP_PORT_REMOVE;\r
-               p_adapter->p_stat->p_prev_port = p_adapter->p_port;\r
+               if ( p_adapter->p_stat )\r
+                       p_adapter->p_stat->p_prev_port = p_adapter->p_port;\r
                p_port = p_adapter->p_port;\r
                p_adapter->p_port = NULL;\r
                cl_obj_unlock( &p_adapter->obj );\r
@@ -1022,7 +1023,8 @@ __ipoib_adapter_reset(
        state = p_adapter->state;\r
 \r
        /* Destroy the current port instance if it still exists. */\r
-       p_adapter->p_stat->p_prev_port = p_adapter->p_port;\r
+       if ( p_adapter->p_stat )\r
+               p_adapter->p_stat->p_prev_port = p_adapter->p_port;\r
        p_port = p_adapter->p_port;\r
        p_adapter->p_port = NULL;\r
        cl_obj_unlock( &p_adapter->obj );\r

diff --git a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_driver.cpp b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_driver.cpp
index 477460b6eac708823733e2cff8019de2c41a787c..2bb4ae2acb28859cbc9ed2ff31068bbedddf9a3a 100644 (file)
--- a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_driver.cpp
+++ b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_driver.cpp
@@ -877,6 +877,11 @@ ipoib_get_adapter_params(
                        (sizeof(eth_hdr_t) + p_adapter->params.payload_mtu);\r
 \r
        NdisReadNetworkAddress( &status, (PVOID *) p_mac, p_len, h_config );\r
+       if (status != NDIS_STATUS_SUCCESS) {\r
+               // Don't rely on NDIS, zero the values\r
+               *p_mac = NULL;\r
+               *p_len = 0;\r
+       }\r
 \r
        NdisCloseConfiguration( h_config );\r
 \r

diff --git a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_stat.h b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_stat.h
index 1c84791ba21a1c92b5ae3b5b3a6b4258120eb15d..1854be4ebb4a47055b296b43f5689188afb024e3 100644 (file)
--- a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_stat.h
+++ b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_stat.h
@@ -41,7 +41,7 @@ typedef struct _IPOIB_ST_DEVICE
        boolean_t                       valid;\r
        ipoib_adapter_t         *p_adapter;\r
        ipoib_port_t            *p_prev_port;\r
-       PRKTHREAD                       *p_halt_thread;\r
+       PRKTHREAD                       p_halt_thread;\r
        int                                     n_power_irps;   // NdisDevicePnPEventPowerProfileChanged \r
        int                                     n_pnp_irps;             // NdisDevicePnPEventSurpriseRemoved \r
        \r

diff --git a/trunk/ulp/srp/kernel/srp_connection.c b/trunk/ulp/srp/kernel/srp_connection.c
index 5b7780ff3da2261d75d74807298c34474671238b..6270752b4fb772249d361478675f468af86303d4 100644 (file)
--- a/trunk/ulp/srp/kernel/srp_connection.c
+++ b/trunk/ulp/srp/kernel/srp_connection.c
@@ -727,7 +727,7 @@ srp_init_connection(
        switch( p_profile->io_class )\r
        {\r
        case SRP_IO_CLASS_R10:\r
-               p_connection->init_port_id.field1 = ca_guid;\r
+               p_connection->init_port_id.field1 = p_path_rec->sgid.unicast.interface_id;\r
                p_connection->init_port_id.field2 = ext_id;\r
                p_connection->targ_port_id.field1 = p_profile->ioc_guid;\r
                p_connection->targ_port_id.field2 = ext_id;\r
@@ -735,7 +735,7 @@ srp_init_connection(
 \r
        case SRP_IO_CLASS:\r
                p_connection->init_port_id.field1 = ext_id;\r
-               p_connection->init_port_id.field2 = ca_guid;\r
+               p_connection->init_port_id.field2 = p_path_rec->sgid.unicast.interface_id;\r
                p_connection->targ_port_id.field1 = ext_id;\r
                p_connection->targ_port_id.field2 = p_profile->ioc_guid;\r
                break;\r