[ALL] map cl_status_t type to NTSTATUS type (only for kernel)

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

diff --git a/branches/Ndi/core/al/kernel/al_cm_cep.c b/branches/Ndi/core/al/kernel/al_cm_cep.c
index 51ea1c313f8cf38b1866f09d6993eba83a691fe3..3f67262f5441c572cac9b494d0a2d9a3ea7d993c 100644 (file)
--- a/branches/Ndi/core/al/kernel/al_cm_cep.c
+++ b/branches/Ndi/core/al/kernel/al_cm_cep.c
@@ -3293,8 +3293,8 @@ create_cep_mgr(
        {\r
                gp_cep_mgr->obj.pfn_destroy( &gp_cep_mgr->obj, NULL );\r
                AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-                       ("cl_vector_init failed with status %s.\n",\r
-                       CL_STATUS_MSG(cl_status)) );\r
+                       ("cl_vector_init failed with status %#x.\n",\r
+                       cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
 \r

diff --git a/branches/Ndi/core/al/kernel/al_ioc_pnp.c b/branches/Ndi/core/al/kernel/al_ioc_pnp.c
index 0970e61af305513ea2bb99e300d8ae47380a02a7..b175de8573614d3854f5b258b91dd213c88daf8f 100644 (file)
--- a/branches/Ndi/core/al/kernel/al_ioc_pnp.c
+++ b/branches/Ndi/core/al/kernel/al_ioc_pnp.c
@@ -717,7 +717,7 @@ __init_ioc_pnp(
        if( cl_status != CL_SUCCESS )\r
        {\r
                AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-                       ("cl_spinlock_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_spinlock_init returned %#x\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
 \r
@@ -725,7 +725,7 @@ __init_ioc_pnp(
        if( cl_status != CL_SUCCESS )\r
        {\r
                AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-                       ("cl_spinlock_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_spinlock_init returned %#x\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
 \r
@@ -733,7 +733,7 @@ __init_ioc_pnp(
        if( cl_status != CL_SUCCESS )\r
        {\r
                AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-                       ("cl_spinlock_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_spinlock_init returned %#x\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
 \r
@@ -743,7 +743,7 @@ __init_ioc_pnp(
        if( cl_status != CL_SUCCESS )\r
        {\r
                AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-                       ("cl_qpool_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_qpool_init returned %#x\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
 \r
@@ -752,7 +752,7 @@ __init_ioc_pnp(
        if( cl_status != CL_SUCCESS )\r
        {\r
                AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-                       ("cl_qpool_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_qpool_init returned %#x\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
 \r
@@ -761,7 +761,7 @@ __init_ioc_pnp(
        if( cl_status != CL_SUCCESS )\r
        {\r
                AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-                       ("cl_qpool_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_qpool_init returned %#x\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
 \r
@@ -771,7 +771,7 @@ __init_ioc_pnp(
        if( cl_status != CL_SUCCESS )\r
        {\r
                AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-                       ("cl_timer_init failed with %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_timer_init failed with %#x\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
 \r

diff --git a/branches/Ndi/core/al/kernel/al_pnp.c b/branches/Ndi/core/al/kernel/al_pnp.c
index df7dffa5d1cf26ec231e913a8f527912d2098d7b..4ec7da20b5bcabdc04d3590619671a79749ddf29 100644 (file)
--- a/branches/Ndi/core/al/kernel/al_pnp.c
+++ b/branches/Ndi/core/al/kernel/al_pnp.c
@@ -203,8 +203,8 @@ create_pnp(
        {\r
                __pnp_free( &gp_pnp->obj );\r
                AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-                       ("cl_ptr_vector_init failed with status %s.\n",\r
-                       CL_STATUS_MSG( cl_status )) );\r
+                       ("cl_ptr_vector_init failed with status %#x.\n",\r
+                       cl_status) );\r
                return IB_ERROR;\r
        }\r
 \r
@@ -1184,8 +1184,8 @@ pnp_ca_event(
                {\r
                        cl_free( p_event_rec );\r
                        AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-                               ("cl_ptr_vector_set_size failed with status %s.\n",\r
-                               CL_STATUS_MSG( cl_status )) );\r
+                               ("cl_ptr_vector_set_size failed with status %#x.\n",\r
+                               cl_status) );\r
                        return ib_convert_cl_status( cl_status );\r
                }\r
 \r

diff --git a/branches/Ndi/core/bus/kernel/bus_iou_mgr.c b/branches/Ndi/core/bus/kernel/bus_iou_mgr.c
index 81ce2cdd8cb1e4831c3d272241a07c30207516ca..7a9e4a88efe73afdf333224ac831c33002b7ce2b 100644 (file)
--- a/branches/Ndi/core/bus/kernel/bus_iou_mgr.c
+++ b/branches/Ndi/core/bus/kernel/bus_iou_mgr.c
@@ -305,7 +305,7 @@ create_iou_mgr(
        {\r
                free_iou_mgr( &gp_iou_mgr->obj );\r
                BUS_TRACE_EXIT( BUS_DBG_ERROR, \r
-                       ("cl_mutex_init returned %s.\n", cl_status_text[cl_status]) );\r
+                       ("cl_mutex_init returned %#x.\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
 \r
@@ -316,7 +316,7 @@ create_iou_mgr(
        {\r
                free_iou_mgr( &gp_iou_mgr->obj );\r
                BUS_TRACE_EXIT( BUS_DBG_ERROR,\r
-                       ("cl_obj_init returned %s.\n", cl_status_text[cl_status]) );\r
+                       ("cl_obj_init returned %#x.\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
 \r

diff --git a/branches/Ndi/core/bus/kernel/bus_port_mgr.c b/branches/Ndi/core/bus/kernel/bus_port_mgr.c
index 704e2eb09dd6b8c4163fd9da6fa840c7880c3f8c..4bee7c106b32fc186a82788cb58a8ae129462d71 100644 (file)
--- a/branches/Ndi/core/bus/kernel/bus_port_mgr.c
+++ b/branches/Ndi/core/bus/kernel/bus_port_mgr.c
@@ -299,7 +299,7 @@ create_port_mgr(
        {\r
                free_port_mgr( &gp_port_mgr->obj );\r
                BUS_TRACE_EXIT( BUS_DBG_ERROR,\r
-                       ("cl_mutex_init returned %s.\n", cl_status_text[cl_status]) );\r
+                       ("cl_mutex_init returned %#x.\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
 \r
@@ -310,7 +310,7 @@ create_port_mgr(
        {\r
                free_port_mgr( &gp_port_mgr->obj );\r
                BUS_TRACE_EXIT( BUS_DBG_ERROR,\r
-                       ("cl_obj_init returned %s.\n", cl_status_text[cl_status]) );\r
+                       ("cl_obj_init returned %#x.\n", cl_status) );\r
                return ib_convert_cl_status( cl_status );\r
        }\r
 \r

diff --git a/branches/Ndi/core/complib/kernel/cl_driver.c b/branches/Ndi/core/complib/kernel/cl_driver.c
index 2efa987681d202352d2b8b886aaa4d0015e99b00..d587cdeef46b1d95d5cbd689e8ed1881517add92 100644 (file)
--- a/branches/Ndi/core/complib/kernel/cl_driver.c
+++ b/branches/Ndi/core/complib/kernel/cl_driver.c
@@ -48,7 +48,7 @@ cl_to_ntstatus(
        case CL_INVALID_OPERATION:\r
                return STATUS_NOT_SUPPORTED;\r
        case CL_INVALID_SETTING:\r
-               return STATUS_INVALID_PARAMETER_1;\r
+               return STATUS_INVALID_PARAMETER_MIX;\r
        case CL_INVALID_PARAMETER:\r
                return STATUS_INVALID_PARAMETER;\r
        case CL_INSUFFICIENT_RESOURCES:\r

diff --git a/branches/Ndi/core/iou/kernel/iou_ioc_mgr.c b/branches/Ndi/core/iou/kernel/iou_ioc_mgr.c
index eb3136414b2d2a684a38778b0643f545eff5c8d7..b3356a288f17bce9dbf3566e58c6b971a72390ea 100644 (file)
--- a/branches/Ndi/core/iou/kernel/iou_ioc_mgr.c
+++ b/branches/Ndi/core/iou/kernel/iou_ioc_mgr.c
@@ -290,7 +290,7 @@ ioc_mgr_init(
        {\r
                free_ioc_mgr( &p_ioc_mgr->obj );\r
                IOU_PRINT_EXIT( TRACE_LEVEL_ERROR, IOU_DBG_ERROR,\r
-                       ("cl_mutex_init returned %s.\n", cl_status_text[cl_status]) );\r
+                       ("cl_mutex_init returned %#x.\n", cl_status) );\r
                return IB_ERROR;\r
        }\r
 \r
@@ -301,7 +301,7 @@ ioc_mgr_init(
        {\r
                free_ioc_mgr( &p_ioc_mgr->obj );\r
                IOU_PRINT_EXIT( TRACE_LEVEL_ERROR, IOU_DBG_ERROR,\r
-                       ("cl_obj_init returned %s.\n", cl_status_text[cl_status]) );\r
+                       ("cl_obj_init returned %#x.\n", cl_status) );\r
                return IB_ERROR;\r
        }\r
 \r

diff --git a/branches/Ndi/hw/mt23108/kernel/hca_driver.c b/branches/Ndi/hw/mt23108/kernel/hca_driver.c
index bc2de2f1be5dc98214a6da198dfcf404a0fce653..39a1eba61781fd8d0eab134b5c63805c1dcacd7f 100644 (file)
--- a/branches/Ndi/hw/mt23108/kernel/hca_driver.c
+++ b/branches/Ndi/hw/mt23108/kernel/hca_driver.c
@@ -291,7 +291,7 @@ DriverEntry(
        {\r
                CL_DEINIT;\r
                HCA_TRACE_EXIT( HCA_DBG_ERROR,\r
-                       ("mlnx_hobs_init returned %s.\n", cl_status_text[cl_status]) );\r
+                       ("mlnx_hobs_init returned %#x.\n", cl_status) );\r
                return cl_to_ntstatus( cl_status );\r
        }\r
 //     cl_memclr( mlnx_hca_array, MLNX_MAX_HCA * sizeof(ci_interface_t) );\r
@@ -422,8 +422,8 @@ hca_add_device(
        //{\r
        //      IoDeleteDevice( p_dev_obj );\r
        //      HCA_TRACE_EXIT( HCA_DBG_ERROR,\r
-       //              ("cl_mutex_init returned %s.\n", cl_status_text[status]) );\r
-       //      return cl_to_ntstatus( status );\r
+       //              ("cl_mutex_init returned %#x.\n", cl_status) );\r
+       //      return cl_to_ntstatus( cl_status );\r
        //}\r
        //cl_event_signal( &p_ext->mutex );\r
 \r

diff --git a/branches/Ndi/hw/mthca/kernel/hca_driver.c b/branches/Ndi/hw/mthca/kernel/hca_driver.c
index a91abe59b7173627a6d40ae98be077155666d284..417da7e3ac2567bdb22bb2b3a4a683cba08b845d 100644 (file)
--- a/branches/Ndi/hw/mthca/kernel/hca_driver.c
+++ b/branches/Ndi/hw/mthca/kernel/hca_driver.c
@@ -196,7 +196,7 @@ DriverEntry(
        if( cl_status != CL_SUCCESS )\r
        {\r
                HCA_PRINT( TRACE_LEVEL_ERROR ,HCA_DBG_INIT ,\r
-                       ("mlnx_hcas_init returned %s.\n", cl_status_text[cl_status]));\r
+                       ("mlnx_hcas_init returned %#x.\n", cl_status));\r
                return cl_to_ntstatus( cl_status );\r
        }\r
 //     cl_memclr( mlnx_hca_array, MLNX_MAX_HCA * sizeof(ci_interface_t) );\r

diff --git a/branches/Ndi/inc/complib/cl_types.h b/branches/Ndi/inc/complib/cl_types.h
index 5e43f54d769e27fb1d0905e166e5a03fdd3bc3c8..fa4e4df1707b9c19517792de7c550878d9987c9a 100644 (file)
--- a/branches/Ndi/inc/complib/cl_types.h
+++ b/branches/Ndi/inc/complib/cl_types.h
@@ -249,6 +249,37 @@ typedef uint64_t           net64_t;
 *\r
 * SYNOPSIS\r
 */\r
+#ifdef CL_KERNEL\r
+\r
+typedef enum _cl_status\r
+{\r
+       CL_SUCCESS                                      = STATUS_SUCCESS,\r
+       CL_ERROR                                                = STATUS_DRIVER_INTERNAL_ERROR,\r
+       CL_INVALID_STATE                                = STATUS_INVALID_DEVICE_STATE,\r
+       CL_INVALID_OPERATION                    = STATUS_NOT_SUPPORTED,\r
+       CL_INVALID_SETTING                      = STATUS_INVALID_PARAMETER_MIX,\r
+       CL_INVALID_PARAMETER                    = STATUS_INVALID_PARAMETER,\r
+       CL_INSUFFICIENT_RESOURCES       = STATUS_INSUFFICIENT_RESOURCES,\r
+       CL_INSUFFICIENT_MEMORY          = STATUS_NO_MEMORY,\r
+       CL_INVALID_PERMISSION                   = STATUS_ACCESS_DENIED,\r
+       CL_COMPLETED                                    = STATUS_EVENT_DONE,\r
+       CL_NOT_DONE                                     = STATUS_ABANDONED,\r
+       CL_PENDING                                              = STATUS_PENDING,\r
+       CL_TIMEOUT                                              = STATUS_TIMEOUT,\r
+       CL_CANCELED                                     = STATUS_CANCELLED,\r
+       CL_REJECT                                               = STATUS_REQUEST_NOT_ACCEPTED,\r
+       CL_OVERRUN                                              = STATUS_DATA_OVERRUN,\r
+       CL_NOT_FOUND                                    = STATUS_NOT_FOUND,\r
+       CL_UNAVAILABLE                          = STATUS_DEVICE_NOT_READY,\r
+       CL_BUSY                                         = STATUS_DEVICE_BUSY,\r
+       CL_DISCONNECT                                   = STATUS_LOCAL_DISCONNECT,\r
+       CL_DUPLICATE                                    = STATUS_DUPLICATE_NAME,\r
+       CL_INVALID_REQUEST                      = STATUS_INVALID_DEVICE_REQUEST\r
+\r
+} cl_status_t;\r
+\r
+#else\r
+\r
 typedef enum _cl_status\r
 {\r
        CL_SUCCESS = 0,\r
@@ -277,6 +308,9 @@ typedef enum _cl_status
        CL_STATUS_COUNT                 /* should be the last value */\r
 \r
 } cl_status_t;\r
+\r
+#endif\r
+\r
 /*\r
 * SEE ALSO\r
 *      Data Types, CL_STATUS_MSG\r
@@ -289,9 +323,10 @@ extern "C"
 #endif /* __cplusplus */\r
 \r
 \r
+#ifndef CL_KERNEL\r
 /* Status values above converted to text for easier printing. */\r
 CL_EXPORT const char* cl_status_text[CL_STATUS_COUNT];\r
-\r
+#endif\r
 \r
 #ifndef cl_panic\r
 /****f* Component Library: Error Trapping/cl_panic\r

diff --git a/branches/Ndi/tests/alts/createanddestroycq.c b/branches/Ndi/tests/alts/createanddestroycq.c
index 778033c186a7a78f1d1aed3bc6172c366501c2cb..2867af77eb89bc577d163fe498cac0ce3558e68c 100644 (file)
--- a/branches/Ndi/tests/alts/createanddestroycq.c
+++ b/branches/Ndi/tests/alts/createanddestroycq.c
@@ -146,8 +146,8 @@ alts_cq(
                                if( cl_status != CL_SUCCESS )\r
                                {\r
                                        ALTS_PRINT( ALTS_DBG_ERROR,\r
-                                               ("cl_event_init returned status %s\n",\r
-                                               cl_status_text[cl_status]) );\r
+                                               ("cl_event_init returned status %#x\n",\r
+                                               cl_status) );\r
                                        break;\r
                                }\r
                                cq_create.h_wait_obj = &cq_event;\r

diff --git a/branches/Ndi/ulp/ipoib/kernel/ipoib_adapter.c b/branches/Ndi/ulp/ipoib/kernel/ipoib_adapter.c
index 27e0cb181f56f4e8a9613087dca22ba50af2980d..fdcd379fd34e1461a407c6583176ac80d31972c1 100644 (file)
--- a/branches/Ndi/ulp/ipoib/kernel/ipoib_adapter.c
+++ b/branches/Ndi/ulp/ipoib/kernel/ipoib_adapter.c
@@ -180,7 +180,7 @@ ipoib_create_adapter(
        {\r
                __adapter_free( &p_adapter->obj );\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_obj_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_obj_init returned %#x\n", cl_status) );\r
                return IB_ERROR;\r
        }\r
 \r
@@ -299,7 +299,7 @@ adapter_init(
        if( cl_status != CL_SUCCESS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_perf_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_perf_init returned %#x\n", cl_status) );\r
                return IB_ERROR;\r
        }\r
 \r
@@ -307,7 +307,7 @@ adapter_init(
        if( cl_status != CL_SUCCESS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_spinlock_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_spinlock_init returned %#x\n", cl_status) );\r
                return IB_ERROR;\r
        }\r
 \r
@@ -315,7 +315,7 @@ adapter_init(
        if( cl_status != CL_SUCCESS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_spinlock_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_spinlock_init returned %#x\n", cl_status) );\r
                return IB_ERROR;\r
        }\r
 \r
@@ -324,7 +324,7 @@ adapter_init(
        if( cl_status != CL_SUCCESS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_qpool_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_qpool_init returned %#x\n", cl_status) );\r
                return IB_ERROR;\r
        }\r
 \r
@@ -335,8 +335,8 @@ adapter_init(
        if( cl_status != CL_SUCCESS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_vector_init for ip_vector returned %s\n",\r
-                       CL_STATUS_MSG(cl_status)) );\r
+                       ("cl_vector_init for ip_vector returned %#x\n",\r
+                       cl_status) );\r
                return IB_ERROR;\r
        }\r
 \r

diff --git a/branches/Ndi/ulp/ipoib/kernel/ipoib_driver.c b/branches/Ndi/ulp/ipoib/kernel/ipoib_driver.c
index 6c7daef0bbb872a7f2665e3bb385793cc2e7f92a..540c9b7e2aa6e8d41f454a40d953af021c67220d 100644 (file)
--- a/branches/Ndi/ulp/ipoib/kernel/ipoib_driver.c
+++ b/branches/Ndi/ulp/ipoib/kernel/ipoib_driver.c
@@ -2127,8 +2127,8 @@ __ipoib_set_net_addr(
                cl_obj_unlock( &p_adapter->obj );\r
                IPOIB_PRINT(TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
                        ("Port %d - OID_GEN_NETWORK_LAYER_ADDRESSES - "\r
-                       "Failed to set IP vector capacity: %s\n", port_num,\r
-                       CL_STATUS_MSG(cl_status)) );\r
+                       "Failed to set IP vector capacity: %#x\n", port_num,\r
+                       cl_status) );\r
                IPOIB_EXIT( IPOIB_DBG_OID );\r
                return NDIS_STATUS_RESOURCES;\r
        }\r

diff --git a/branches/Ndi/ulp/ipoib/kernel/ipoib_port.c b/branches/Ndi/ulp/ipoib/kernel/ipoib_port.c
index 8a5898d2c7449af2875f4e8d636f6f2fcf8b6840..787d2d37c82411b9ff3958c340ebdd97e2daf84e 100644 (file)
--- a/branches/Ndi/ulp/ipoib/kernel/ipoib_port.c
+++ b/branches/Ndi/ulp/ipoib/kernel/ipoib_port.c
@@ -601,7 +601,7 @@ __port_init(
        if( cl_status != CL_SUCCESS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_spinlock_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_spinlock_init returned %#x\n", cl_status) );\r
                return IB_ERROR;\r
        }\r
 \r
@@ -609,7 +609,7 @@ __port_init(
        if( cl_status != CL_SUCCESS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_spinlock_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_spinlock_init returned %#x\n", cl_status) );\r
                return IB_ERROR;\r
        }\r
 \r
@@ -666,7 +666,7 @@ __port_init(
        if( cl_status != CL_SUCCESS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_obj_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_obj_init returned %#x\n", cl_status) );\r
                return IB_ERROR;\r
        }\r
 \r
@@ -674,7 +674,7 @@ __port_init(
        if( cl_status != CL_SUCCESS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_obj_insert_rel returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_obj_insert_rel returned %#x\n", cl_status) );\r
                cl_obj_destroy( &p_port->obj );\r
                return IB_ERROR;\r
        }\r
@@ -998,8 +998,8 @@ __buf_mgr_init(
                NdisWriteErrorLogEntry( p_port->p_adapter->h_adapter,\r
                        EVENT_IPOIB_RECV_POOL, 1, cl_status );\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_qpool_init for recvs returned %s\n",\r
-                       cl_status_text[cl_status]) );\r
+                       ("cl_qpool_init for recvs returned %#x\n",\r
+                       cl_status) );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r

diff --git a/branches/Ndi/ulp/srp/kernel/srp_hba.c b/branches/Ndi/ulp/srp/kernel/srp_hba.c
index f760ce0dc9c97bc632612ff7c10c8ad8d17244a1..09d69c49be82180da35b6571cbbf26eb1bee0bc9 100644 (file)
--- a/branches/Ndi/ulp/srp/kernel/srp_hba.c
+++ b/branches/Ndi/ulp/srp/kernel/srp_hba.c
@@ -239,7 +239,7 @@ srp_hba_create(
        if( cl_status != CL_SUCCESS )\r
        {\r
                SRP_PRINT_EXIT( TRACE_LEVEL_ERROR, SRP_DBG_ERROR,\r
-                       ("cl_obj_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_obj_init returned %#x\n", cl_status) );\r
                return IB_ERROR;\r
        }\r
 \r

diff --git a/branches/Ndi/ulp/srp/kernel/srp_session.c b/branches/Ndi/ulp/srp/kernel/srp_session.c
index d2deb56d75c4ba1d912ec51feef5d051b7be7e7a..502e4d7be7683d24b6db655e1287c41426025846 100644 (file)
--- a/branches/Ndi/ulp/srp/kernel/srp_session.c
+++ b/branches/Ndi/ulp/srp/kernel/srp_session.c
@@ -291,7 +291,7 @@ srp_new_session(
        if( cl_status != CL_SUCCESS )\r
        {\r
                SRP_PRINT_EXIT( TRACE_LEVEL_ERROR, SRP_DBG_ERROR,\r
-                       ("cl_obj_init returned %s\n", cl_status_text[cl_status]) );\r
+                       ("cl_obj_init returned %#x\n", cl_status) );\r
 \r
                cl_free( p_srp_session );\r
                p_srp_session = NULL;\r