[ipoib] Return the link speed even if the link is down. (mlnx: 3304)

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

diff --git a/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_adapter.c b/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_adapter.c
index 53014195b36a705320682cbf40c95dcef4174356..d84574f1a1d9ccc86637744c0ccf431309a622bf 100644 (file)
--- a/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_adapter.c
+++ b/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_adapter.c
@@ -306,7 +306,7 @@ adapter_construct(
        cl_perf_construct( &p_adapter->perf );\r
 \r
        p_adapter->state = IB_PNP_PORT_ADD;\r
-       p_adapter->rate = FOUR_X_IN_100BPS;\r
+       p_adapter->port_rate = FOUR_X_IN_100BPS;\r
 }\r
 \r
 \r
@@ -1065,7 +1065,7 @@ ipoib_set_rate(
                rate = 0;\r
        }\r
 \r
-       p_adapter->rate = rate;\r
+       p_adapter->port_rate = rate;\r
        IPOIB_EXIT( IPOIB_DBG_INIT );\r
 }\r
 \r
@@ -1124,8 +1124,8 @@ ipoib_set_active(
                 */\r
                IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT, ("Link UP!\n") );\r
                NdisWriteErrorLogEntry( p_adapter->h_adapter,\r
-                       EVENT_IPOIB_PORT_UP + (p_adapter->rate/ONE_X_IN_100BPS),\r
-                       1, p_adapter->rate );\r
+                       EVENT_IPOIB_PORT_UP + (p_adapter->port_rate/ONE_X_IN_100BPS),\r
+                       1, p_adapter->port_rate );\r
 \r
                if( !p_adapter->reset )\r
                {\r

diff --git a/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_adapter.h b/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_adapter.h
index 84425e942c02c3bd932191028cd986a9cda3551e..a20e3fb01f2cc7f004fad24e9664e87335ebf5e5 100644 (file)
--- a/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_adapter.h
+++ b/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_adapter.h
@@ -168,7 +168,7 @@ typedef struct _ipoib_adapter
 \r
        struct _ipoib_port              *p_port;\r
 \r
-       uint32_t                                rate;\r
+       uint32_t                                port_rate;\r
 \r
        ipoib_params_t                  params;\r
        cl_spinlock_t                   recv_stat_lock;\r

diff --git a/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_driver.c b/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_driver.c
index 40d5c3795f95c947575d69733a55b18cebe4d2ce..2e5cd881fa74f78a80c3ba11ba20b67d27164985 100644 (file)
--- a/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_driver.c
+++ b/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_driver.c
@@ -955,31 +955,7 @@ ipoib_query_info(
                IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
                        ("Port %d received query for OID_GEN_LINK_SPEED\n", port_num) );\r
                cl_obj_lock( &p_adapter->obj );\r
-               switch( p_adapter->state )\r
-               {\r
-               case IB_PNP_PORT_ADD:\r
-                       /* Mark the adapter as pending an OID */\r
-                       p_adapter->pending_query = TRUE;\r
-\r
-                       /* Save the request parameters. */\r
-                       p_adapter->query_oid = oid_info;\r
-\r
-                       IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
-                               ("Port %d returning NDIS_STATUS_PENDING\n", port_num) );\r
-                       status = NDIS_STATUS_PENDING;\r
-                       break;\r
-\r
-               case IB_PNP_PORT_REMOVE:\r
-                       IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
-                               ("Port %d returning NDIS_STATUS_NOT_ACCEPTED\n", port_num) );\r
-                       status = NDIS_STATUS_NOT_ACCEPTED;\r
-                       break;\r
-\r
-               default:\r
-                       CL_ASSERT( p_adapter->p_port );\r
-                       info = p_adapter->rate;\r
-                       break;\r
-               }\r
+               info = p_adapter->port_rate;\r
                cl_obj_unlock( &p_adapter->obj );\r
                break;\r
 \r
@@ -2016,11 +1992,6 @@ ipoib_resume_oids(
        {\r
                switch( query_oid.oid )\r
                {\r
-               case OID_GEN_LINK_SPEED:\r
-                       ipoib_complete_query( p_adapter, &query_oid,\r
-                               status, &p_adapter->rate, sizeof(p_adapter->rate) );\r
-                       break;\r
-\r
                case OID_GEN_MEDIA_CONNECT_STATUS:\r
                        info = NdisMediaStateConnected;\r
                        ipoib_complete_query( p_adapter, &query_oid,\r
@@ -2028,8 +1999,7 @@ ipoib_resume_oids(
                        break;\r
 \r
                default:\r
-                       CL_ASSERT( query_oid.oid == OID_GEN_LINK_SPEED ||\r
-                               query_oid.oid == OID_GEN_MEDIA_CONNECT_STATUS );\r
+                       CL_ASSERT( query_oid.oid == OID_GEN_MEDIA_CONNECT_STATUS );\r
                        break;\r
                }\r
        }\r