[ipoib cm] propagated missed changes from the trunk.

- patch rev. 1892 for OID_GEN_MAXIMUM_SEND_PACKETS.
- validate interface before dereferencing.

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

diff --git a/branches/ipoib_cm/kernel/ipoib_driver.c b/branches/ipoib_cm/kernel/ipoib_driver.c
index 80d854cba8038e139054721a1f0d786067993da6..e6b7f0cc715064061d8a637ac022507ab940b6d3 100644 (file)
--- a/branches/ipoib_cm/kernel/ipoib_driver.c
+++ b/branches/ipoib_cm/kernel/ipoib_driver.c
@@ -706,8 +706,9 @@ ipoib_get_adapter_guids(
         * query remove IRP.  We will always get unloaded before the bus driver\r
         * since we're a child device.\r
         */\r
-       p_adapter->p_ifc->wdm.InterfaceDereference(\r
-               p_adapter->p_ifc->wdm.Context );\r
+       if (p_adapter->p_ifc)\r
+               p_adapter->p_ifc->wdm.InterfaceDereference(\r
+                       p_adapter->p_ifc->wdm.Context );\r
        IPOIB_EXIT( IPOIB_DBG_INIT );\r
        return NDIS_STATUS_SUCCESS;\r
 }\r
@@ -1114,7 +1115,7 @@ ipoib_query_info(
        case OID_GEN_MAXIMUM_SEND_PACKETS:\r
                IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
                        ("Port %d received query for OID_GEN_MAXIMUM_SEND_PACKETS\n", port_num) );\r
-               info = MAXULONG;\r
+               info = MINIPORT_MAX_SEND_PACKETS;\r
                break;\r
 \r
        /* Required General Statistics */\r

diff --git a/branches/ipoib_cm/kernel/ipoib_driver.h b/branches/ipoib_cm/kernel/ipoib_driver.h
index f82ff67d5ba9fdc96a70aab2dbd495c6847fe241..762dac497bd3dead2a13c9a549a6765d04214e16 100644 (file)
--- a/branches/ipoib_cm/kernel/ipoib_driver.h
+++ b/branches/ipoib_cm/kernel/ipoib_driver.h
@@ -47,6 +47,9 @@
  */\r
 #define MAX_BUNDLE_ID_LENGTH   32\r
 \r
+/* The maximum number of send packets the MiniportSendPackets function can accept */\r
+#define MINIPORT_MAX_SEND_PACKETS      200\r
+\r
 /* MLX4 supports 4K MTU */\r
 #define MAX_IB_MTU                     4096\r
 #define DEFAULT_MTU                    2048\r