]> git.openfabrics.org - ~shefty/rdma-win.git/commitdiff
[IPOIB_NDIS6_CM] white-space (tabstop=4 & line length(85)) alignments, spelling corre...
authorStan Smith <stan.smith@intel.com>
Tue, 3 Aug 2010 20:53:56 +0000 (20:53 +0000)
committerStan Smith <stan.smith@intel.com>
Tue, 3 Aug 2010 20:53:56 +0000 (20:53 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1@2868 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_adapter.cpp
trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_adapter.h
trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_driver.cpp
trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp
trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h
trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.h

index 769739693e4b2b9aa0b9bc5790b3e3def5fb99a4..01a6898b7e132b6e99e88ce8daa339d9f5476063 100644 (file)
@@ -166,7 +166,7 @@ ipoib_create_adapter(
                        p_adapter->guids.port_num) );\r
 \r
        cl_status = cl_obj_init( &p_adapter->obj, CL_DESTROY_SYNC,\r
-               __adapter_destroying, NULL, __adapter_free );\r
+                                                        __adapter_destroying, NULL, __adapter_free );\r
        if( cl_status != CL_SUCCESS )\r
        {\r
                __adapter_free( &p_adapter->obj );\r
@@ -209,7 +209,7 @@ ipoib_create_adapter(
                                mac[3], mac[4], mac[5]) );\r
                }\r
                else\r
-       {\r
+               {\r
                        ETH_COPY_NETWORK_ADDRESS( p_adapter->params.conf_mac.addr, mac );\r
                }\r
        }\r
@@ -265,8 +265,7 @@ ipoib_destroy_adapter(
         * between destruction and AL callbacks (PnP, Query, Destruction).\r
         * The lock provides protection\r
         */\r
-       KeWaitForMutexObject(\r
-               &p_adapter->mutex, Executive, KernelMode, FALSE, NULL );\r
+       KeWaitForMutexObject( &p_adapter->mutex, Executive, KernelMode, FALSE, NULL );\r
        cl_obj_lock( &p_adapter->obj );\r
        p_adapter->state = IB_PNP_PORT_REMOVE;\r
 \r
@@ -364,15 +363,18 @@ adapter_init(
        }\r
 \r
        /* Validate the port GUID and generate the MAC address. */\r
-       status =\r
-               ipoib_mac_from_guid( p_adapter->guids.port_guid.guid, p_adapter->params.guid_mask, &p_adapter->mac);\r
+       status = ipoib_mac_from_guid( p_adapter->guids.port_guid.guid,\r
+                                                                 p_adapter->params.guid_mask,\r
+                                                                 &p_adapter->mac);\r
        if( status != IB_SUCCESS )\r
        {\r
                if( status == IB_INVALID_GUID_MASK )\r
                {\r
                        IPOIB_PRINT( TRACE_LEVEL_WARNING, IPOIB_DBG_ERROR,\r
                                ("Invalid GUID mask received, rejecting it") );\r
-                       ipoib_create_log(p_adapter->h_adapter, GUID_MASK_LOG_INDEX, EVENT_IPOIB_WRONG_PARAMETER_WRN);\r
+                       ipoib_create_log( p_adapter->h_adapter,\r
+                                                         GUID_MASK_LOG_INDEX,\r
+                                                         EVENT_IPOIB_WRONG_PARAMETER_WRN );\r
                }\r
 \r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
@@ -391,7 +393,6 @@ adapter_init(
                return status;\r
        }\r
        \r
-       \r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT,\r
                ("Shutter Init, state = %d\n", p_adapter->ipoib_state) );\r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_RECV,\r
@@ -444,8 +445,8 @@ __ipoib_pnp_reg(
         */\r
        cl_obj_ref( &p_adapter->obj );\r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_OBJ,\r
-                               ("[%p] Adapter refcount raised to %d\n", p_adapter, p_adapter->obj.ref_cnt));\r
-\r
+               ("[%p] Adapter refcount raised to %d\n",\r
+               p_adapter, p_adapter->obj.ref_cnt));\r
 \r
        IPOIB_EXIT( IPOIB_DBG_INIT );\r
        return status;\r
@@ -471,10 +472,11 @@ __adapter_destroying(
        if( p_adapter->h_pnp )\r
        {\r
                IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_OBJ,\r
-                               ("Adapter[%p] has refcnt= %d\n", p_adapter, p_adapter->obj.ref_cnt));\r
+                       ("Adapter[%p] has refcnt= %d\n", p_adapter, p_adapter->obj.ref_cnt));\r
                p_adapter->p_ifc->dereg_pnp( p_adapter->h_pnp, (ib_pfn_destroy_cb_t) cl_obj_deref );\r
                IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_OBJ,\r
-                               ("Adapter[%p] refcnt decremented to %d\n", p_adapter, p_adapter->obj.ref_cnt));\r
+                       ("Adapter[%p] refcnt decremented to %d\n",\r
+                               p_adapter, p_adapter->obj.ref_cnt));\r
                p_adapter->h_pnp = NULL;\r
        }\r
 \r
@@ -1207,9 +1209,11 @@ ipoib_set_active(
                /* Join all programmed multicast groups. */\r
                for( i = 0; i < p_adapter->mcast_array_size; i++ )\r
                {\r
-                       IPOIB_PRINT_EXIT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,("Calling join mcast from ipoib_set_active\n"));\r
-                       ipoib_port_join_mcast(\r
-                               p_adapter->p_port, p_adapter->mcast_array[i] ,IB_MC_REC_STATE_FULL_MEMBER);\r
+                       IPOIB_PRINT_EXIT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,\r
+                                       ("Calling join mcast from ipoib_set_active\n"));\r
+                       ipoib_port_join_mcast( p_adapter->p_port,\r
+                                                                  p_adapter->mcast_array[i],\r
+                                                                  IB_MC_REC_STATE_FULL_MEMBER );\r
                }\r
 \r
                /* Register all existing addresses. */\r
@@ -1221,7 +1225,8 @@ ipoib_set_active(
                 * Now that we're in the broadcast group, notify that\r
                 * we have a link.\r
                 */\r
-               IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT, ("Link UP!\n") );\r
+               IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT,\r
+                       ("Link UP! in the broadcast group\n") );\r
                NdisWriteErrorLogEntry( p_adapter->h_adapter,\r
                        EVENT_IPOIB_PORT_UP + (p_adapter->port_rate/ONE_X_IN_100BPS),\r
                        1, p_adapter->port_rate );\r
@@ -1241,7 +1246,8 @@ ipoib_set_active(
                                                                   NDIS_STATUS_LINK_STATE,\r
                                                                   (PVOID)&link_state,\r
                                                                   sizeof(link_state));\r
-                       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT, ("***************Indicate connect!\n") );\r
+                       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT,\r
+                                       ("***************Indicate connect!\n") );\r
                        NdisMIndicateStatusEx(p_adapter->h_adapter,&status_indication);\r
                }\r
        }\r
@@ -1324,6 +1330,7 @@ ipoib_get_gen_stat(
        OUT             pending_oid_t* const            p_oid_info)\r
 {\r
        PNDIS_STATISTICS_INFO StatisticsInfo;\r
+\r
        IPOIB_ENTER( IPOIB_DBG_STAT );\r
 \r
        if (p_oid_info->buf_len < sizeof(StatisticsInfo))\r
@@ -1336,63 +1343,64 @@ ipoib_get_gen_stat(
     StatisticsInfo->Header.Revision = NDIS_OBJECT_REVISION_1;\r
     StatisticsInfo->Header.Type = NDIS_OBJECT_TYPE_DEFAULT;\r
     StatisticsInfo->Header.Size = sizeof(NDIS_STATISTICS_INFO);\r
-    /*StatisticsInfo->SupportedStatistics = NDIS_STATISTICS_FLAGS_VALID_RCV_DISCARDS          |\r
-                                          NDIS_STATISTICS_FLAGS_VALID_RCV_ERROR             |\r
-                                                                                 NDIS_STATISTICS_FLAGS_VALID_DIRECTED_FRAMES_RCV   |\r
-                                          NDIS_STATISTICS_FLAGS_VALID_MULTICAST_FRAMES_RCV  |\r
-                                                                                 NDIS_STATISTICS_FLAGS_VALID_BROADCAST_FRAMES_RCV  |\r
-                                          NDIS_STATISTICS_FLAGS_VALID_BYTES_RCV             | \r
-                                          NDIS_STATISTICS_FLAGS_VALID_MULTICAST_BYTES_RCV   |\r
-                                                                                 NDIS_STATISTICS_FLAGS_VALID_BROADCAST_BYTES_RCV       |\r
-                                                                                 NDIS_STATISTICS_FLAGS_VALID_DIRECTED_BYTES_RCV        |\r
-\r
-                                                                                 NDIS_STATISTICS_FLAGS_VALID_XMIT_DISCARDS                     |\r
-                                                                                 NDIS_STATISTICS_FLAGS_VALID_XMIT_ERROR            |\r
-                                                                                 NDIS_STATISTICS_FLAGS_VALID_DIRECTED_FRAMES_XMIT  | \r
-                                          NDIS_STATISTICS_FLAGS_VALID_MULTICAST_FRAMES_XMIT |\r
-                                                                                 NDIS_STATISTICS_FLAGS_VALID_BROADCAST_FRAMES_XMIT |\r
-                                                                                 NDIS_STATISTICS_FLAGS_VALID_BYTES_XMIT                        |\r
-                                                                                 NDIS_STATISTICS_FLAGS_VALID_DIRECTED_BYTES_XMIT       |\r
-                                                                                 NDIS_STATISTICS_FLAGS_VALID_MULTICAST_BYTES_XMIT      |\r
-                                                                                 NDIS_STATISTICS_FLAGS_VALID_BROADCAST_BYTES_XMIT; */\r
+    /*StatisticsInfo->SupportedStatistics =\r
+               NDIS_STATISTICS_FLAGS_VALID_RCV_DISCARDS          |\r
+        NDIS_STATISTICS_FLAGS_VALID_RCV_ERROR             |\r
+               NDIS_STATISTICS_FLAGS_VALID_DIRECTED_FRAMES_RCV   |\r
+        NDIS_STATISTICS_FLAGS_VALID_MULTICAST_FRAMES_RCV  |\r
+               NDIS_STATISTICS_FLAGS_VALID_BROADCAST_FRAMES_RCV  |\r
+        NDIS_STATISTICS_FLAGS_VALID_BYTES_RCV             | \r
+        NDIS_STATISTICS_FLAGS_VALID_MULTICAST_BYTES_RCV   |\r
+               NDIS_STATISTICS_FLAGS_VALID_BROADCAST_BYTES_RCV   |\r
+               NDIS_STATISTICS_FLAGS_VALID_DIRECTED_BYTES_RCV    |\r
+               NDIS_STATISTICS_FLAGS_VALID_XMIT_DISCARDS                 |\r
+               NDIS_STATISTICS_FLAGS_VALID_XMIT_ERROR            |\r
+               NDIS_STATISTICS_FLAGS_VALID_DIRECTED_FRAMES_XMIT  | \r
+        NDIS_STATISTICS_FLAGS_VALID_MULTICAST_FRAMES_XMIT |\r
+               NDIS_STATISTICS_FLAGS_VALID_BROADCAST_FRAMES_XMIT |\r
+               NDIS_STATISTICS_FLAGS_VALID_BYTES_XMIT                    |\r
+               NDIS_STATISTICS_FLAGS_VALID_DIRECTED_BYTES_XMIT   |\r
+               NDIS_STATISTICS_FLAGS_VALID_MULTICAST_BYTES_XMIT  |\r
+               NDIS_STATISTICS_FLAGS_VALID_BROADCAST_BYTES_XMIT; */\r
                                                                                  \r
                                                                                  \r
-       StatisticsInfo->SupportedStatistics =  NDIS_STATISTICS_FLAGS_VALID_DIRECTED_FRAMES_RCV |\r
-                                                                                       //The data in the ifHCInUcastPkts member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_MULTICAST_FRAMES_RCV |\r
-                                                                                       //The data in the ifHCInMulticastPkts member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_BROADCAST_FRAMES_RCV |\r
-                                                                                       //The data in the ifHCInBroadcastPkts member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_BYTES_RCV |\r
-                                                                                       //The data in the ifHCInOctets member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_RCV_DISCARDS |\r
-                                                                                       //The data in the ifInDiscards member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_RCV_ERROR |\r
-                                                                                       //The data in the ifInErrors member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_DIRECTED_FRAMES_XMIT |\r
-                                                                                       //The data in the ifHCOutUcastPkts member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_MULTICAST_FRAMES_XMIT |\r
-                                                                                       //The data in the ifHCOutMulticastPkts member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_BROADCAST_FRAMES_XMIT |\r
-                                                                                       //The data in the ifHCOutBroadcastPkts member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_BYTES_XMIT |\r
-                                                                                       //The data in the ifHCOutOctets member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_XMIT_ERROR |\r
-                                                                                       //The data in the ifOutErrors member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_XMIT_DISCARDS |\r
-                                                                                       //The data in the ifOutDiscards member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_DIRECTED_BYTES_RCV |\r
-                                                                                       //The data in the ifHCInUcastOctets member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_MULTICAST_BYTES_RCV |\r
-                                                                                       //The data in the ifHCInMulticastOctets member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_BROADCAST_BYTES_RCV |\r
-                                                                                       //The data in the ifHCInBroadcastOctets member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_DIRECTED_BYTES_XMIT |\r
-                                                                                       //The data in the ifHCOutUcastOctets member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_MULTICAST_BYTES_XMIT |\r
-                                                                                       //The data in the ifHCOutMulticastOctets member is valid. \r
-                                                                                       NDIS_STATISTICS_FLAGS_VALID_BROADCAST_BYTES_XMIT ;\r
-                                                                                       //The data in the ifHCOutBroadcastOctets member is valid\r
+       StatisticsInfo->SupportedStatistics =\r
+                       NDIS_STATISTICS_FLAGS_VALID_DIRECTED_FRAMES_RCV |\r
+                       //The data in the ifHCInUcastPkts member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_MULTICAST_FRAMES_RCV |\r
+                       //The data in the ifHCInMulticastPkts member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_BROADCAST_FRAMES_RCV |\r
+                       //The data in the ifHCInBroadcastPkts member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_BYTES_RCV |\r
+                       //The data in the ifHCInOctets member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_RCV_DISCARDS |\r
+                       //The data in the ifInDiscards member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_RCV_ERROR |\r
+                       //The data in the ifInErrors member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_DIRECTED_FRAMES_XMIT |\r
+                       //The data in the ifHCOutUcastPkts member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_MULTICAST_FRAMES_XMIT |\r
+                       //The data in the ifHCOutMulticastPkts member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_BROADCAST_FRAMES_XMIT |\r
+                       //The data in the ifHCOutBroadcastPkts member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_BYTES_XMIT |\r
+                       //The data in the ifHCOutOctets member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_XMIT_ERROR |\r
+                       //The data in the ifOutErrors member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_XMIT_DISCARDS |\r
+                       //The data in the ifOutDiscards member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_DIRECTED_BYTES_RCV |\r
+                       //The data in the ifHCInUcastOctets member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_MULTICAST_BYTES_RCV |\r
+                       //The data in the ifHCInMulticastOctets member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_BROADCAST_BYTES_RCV |\r
+                       //The data in the ifHCInBroadcastOctets member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_DIRECTED_BYTES_XMIT |\r
+                       //The data in the ifHCOutUcastOctets member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_MULTICAST_BYTES_XMIT |\r
+                       //The data in the ifHCOutMulticastOctets member is valid. \r
+                       NDIS_STATISTICS_FLAGS_VALID_BROADCAST_BYTES_XMIT ;\r
+                       //The data in the ifHCOutBroadcastOctets member is valid\r
 \r
     cl_spinlock_acquire( &p_adapter->recv_stat_lock );\r
     StatisticsInfo->ifInDiscards = p_adapter->recv_stats.comp.dropped +\r
@@ -1425,7 +1433,7 @@ ipoib_get_gen_stat(
 \r
        *p_oid_info->p_bytes_used = sizeof(NDIS_STATISTICS_INFO);\r
 \r
-       IPOIB_EXIT( IPOIB_DBG_INIT );\r
+       IPOIB_EXIT( IPOIB_DBG_STAT );\r
        return NDIS_STATUS_SUCCESS;\r
 }\r
 \r
index de28d977af00e62ed172271ef0ef82cb18eab36a..12027d63554fa9d7db7179d4dd24db495b6cdf89 100644 (file)
@@ -151,21 +151,21 @@ typedef struct _ipoib_params
 *              (i.e. 2 indicates 1/2, 4 indicates 1/4, etc.)\r
 *\r
 *      payload_mtu\r
-               The maximum available size of IPoIB transfer unit.\r
-               \r
-               If using UD mode:\r
+*              The maximum available size of IPoIB transfer unit.\r
+*              \r
+*              If using UD mode:\r
 *              It should be decremented by size of IPoIB header (==4B)\r
 *              For example, if the HCA support 4K MTU, \r
 *              upper threshold for payload mtu is 4092B and not 4096B\r
-\r
-               If using CM mode:\r
-               MTU will be not limited by 4K threshold.\r
-               UD QP still may be used for different protocols (like ARP).\r
-               For these situations the threshold for the UD QP will take the default value\r
-               \r
+*\r
+*              If using CM mode:\r
+*              MTU will be not limited by 4K threshold.\r
+*              UD QP still may be used for different protocols (like ARP).\r
+*              For these situations the threshold for the UD QP will take the default\r
+*              value\r
 *\r
 *      lso\r
-*      It indicates if there's a support for hardware large/giant send offload\r
+*              (TRUE) Indicates support for hardware large/giant send offload\r
 *              \r
 *********/\r
 \r
index 2d8f68440396c2f76f749797c50d2dc4541b9008..850b2d43d7b6b203370a60dbef1b7b9a9cddb376 100644 (file)
@@ -223,8 +223,7 @@ IPOIB_REG_ENTRY HCARegTable[] = {
        {NDIS_STRING_CONST("BCJoinRetry"),          1, IPOIB_OFFSET(bc_join_retry),                 IPOIB_SIZE(bc_join_retry),      50,         0,    1000},\r
        {NDIS_STRING_CONST("CmEnabled"),        0, IPOIB_OFFSET(cm_enabled),            IPOIB_SIZE(cm_enabled),         FALSE,     FALSE, TRUE},\r
        {NDIS_STRING_CONST("CmPayloadMtu"),     1, IPOIB_OFFSET(cm_payload_mtu),        IPOIB_SIZE(cm_payload_mtu),     MAX_CM_PAYLOAD_MTU, 512, MAX_CM_PAYLOAD_MTU}\r
-\r
-};  \r
+}; \r
 \r
 #define IPOIB_NUM_REG_PARAMS (sizeof (HCARegTable) / sizeof(IPOIB_REG_ENTRY))\r
 \r
@@ -642,25 +641,33 @@ ipoib_get_adapter_params(
                                p_param->ParameterData.IntegerData > pRegEntry[i].Max)\r
                        {\r
                                value = pRegEntry[i].Default;\r
-                               ipoib_create_log(p_adapter->h_adapter, i, EVENT_IPOIB_WRONG_PARAMETER_WRN);\r
-                               IPOIB_PRINT(TRACE_LEVEL_VERBOSE, IPOIB_DBG_INIT, ("Read configuration.Registry %S value is out of range, setting default value= 0x%x\n", pRegEntry[i].RegName.Buffer, value));                                \r
-\r
+                               ipoib_create_log(p_adapter->h_adapter, i,\r
+                                                                       EVENT_IPOIB_WRONG_PARAMETER_WRN);\r
+                               IPOIB_PRINT(TRACE_LEVEL_VERBOSE, IPOIB_DBG_INIT,\r
+                                       ("Read configuration.Registry %S value is out of range, "\r
+                                        "setting default value= 0x%x\n",\r
+                                       pRegEntry[i].RegName.Buffer, value));\r
                        }\r
                        else\r
                        {\r
                                value = p_param->ParameterData.IntegerData;\r
-                               IPOIB_PRINT(TRACE_LEVEL_VERBOSE, IPOIB_DBG_INIT, ("Read configuration. Registry %S, Value= 0x%x\n", pRegEntry[i].RegName.Buffer, value));\r
+                               IPOIB_PRINT(TRACE_LEVEL_VERBOSE, IPOIB_DBG_INIT,\r
+                                       ("Read configuration. Registry %S, Value= 0x%x\n",\r
+                                       pRegEntry[i].RegName.Buffer, value));\r
                        }\r
                }\r
-\r
                else\r
                {\r
                        value = pRegEntry[i].Default;\r
                        status = NDIS_STATUS_SUCCESS;\r
                        if (pRegEntry[i].bRequired)\r
                        {\r
-                               ipoib_create_log(p_adapter->h_adapter, i, EVENT_IPOIB_WRONG_PARAMETER_ERR);\r
-                               IPOIB_PRINT(TRACE_LEVEL_ERROR, IPOIB_DBG_INIT, ("Read configuration.Registry %S value not found, setting default value= 0x%x\n", pRegEntry[i].RegName.Buffer, value));\r
+                               ipoib_create_log(p_adapter->h_adapter, i,\r
+                                                                       EVENT_IPOIB_WRONG_PARAMETER_ERR);\r
+                               IPOIB_PRINT(TRACE_LEVEL_ERROR, IPOIB_DBG_INIT,\r
+                                       ("Read configuration.Registry %S value not found, setting "\r
+                                        "default value= 0x%x\n",\r
+                                       pRegEntry[i].RegName.Buffer, value));\r
                        }\r
                        else\r
                        {\r
@@ -686,7 +693,8 @@ ipoib_get_adapter_params(
                                break;\r
 \r
                        default:\r
-                               IPOIB_PRINT(TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR, ("Bogus field size %d\n", pRegEntry[i].FieldSize));\r
+                               IPOIB_PRINT(TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
+                                       ("Bogus field size %d\n", pRegEntry[i].FieldSize));\r
                                break;\r
                }\r
        }\r
@@ -696,11 +704,14 @@ ipoib_get_adapter_params(
 \r
        if (p_adapter->params.sq_depth % sq_depth_step) {\r
                static const c_sq_ind = 2;\r
-               p_adapter->params.sq_depth = sq_depth_step *(\r
-                       p_adapter->params.sq_depth / sq_depth_step + !!( (p_adapter->params.sq_depth % sq_depth_step) > (sq_depth_step/2) ));\r
-               ipoib_create_log(p_adapter->h_adapter, c_sq_ind, EVENT_IPOIB_WRONG_PARAMETER_WRN);\r
-               IPOIB_PRINT(TRACE_LEVEL_VERBOSE, IPOIB_DBG_INIT, ("SQ DEPTH value was rounded to the closest acceptable value of  0x%x\n", p_adapter->params.sq_depth ));\r
-\r
+               p_adapter->params.sq_depth = sq_depth_step *\r
+                       (p_adapter->params.sq_depth / sq_depth_step +\r
+                       !!((p_adapter->params.sq_depth % sq_depth_step) > (sq_depth_step/2)));\r
+               ipoib_create_log(p_adapter->h_adapter, c_sq_ind,\r
+                                                       EVENT_IPOIB_WRONG_PARAMETER_WRN);\r
+               IPOIB_PRINT(TRACE_LEVEL_VERBOSE, IPOIB_DBG_INIT,\r
+                       ("SQ DEPTH value was rounded to the closest acceptable value "\r
+                        "of 0x%x\n", p_adapter->params.sq_depth ));\r
        }\r
 \r
        // Adjusting the low watermark parameter\r
@@ -1541,12 +1552,15 @@ SetOffloadParameters(
     if (len != NDIS_SIZEOF_OFFLOAD_PARAMETERS_REVISION_2)\r
     {\r
         ASSERT(FALSE);\r
-        IPOIB_PRINT(TRACE_LEVEL_ERROR, IPOIB_DBG_OID, ("Buffer is too small. offloading task requirs %d but the buffer size is: %d \n", NDIS_SIZEOF_OFFLOAD_PARAMETERS_REVISION_2, len));\r
+        IPOIB_PRINT(TRACE_LEVEL_ERROR, IPOIB_DBG_OID,\r
+                       ("Buffer is too small. offloading task requirs %d but the buffer "\r
+                        "size is: %d \n", NDIS_SIZEOF_OFFLOAD_PARAMETERS_REVISION_2, len));\r
         Status =  NDIS_STATUS_INVALID_LENGTH;\r
         goto Exit;\r
     }\r
 \r
-    IPOIB_PRINT(TRACE_LEVEL_VERBOSE, IPOIB_DBG_OID, ("received set for OID_TCP_TASK_OFFLOAD\n"));\r
+    IPOIB_PRINT(TRACE_LEVEL_VERBOSE, IPOIB_DBG_OID,\r
+               ("received set for OID_TCP_TASK_OFFLOAD\n"));\r
 \r
     pOffloadParam = (PNDIS_OFFLOAD_PARAMETERS) pBuf;\r
     pOffloadHeader = &(pOffloadParam->Header);\r
@@ -1556,7 +1570,8 @@ SetOffloadParameters(
        (pOffloadHeader->Size != NDIS_SIZEOF_OFFLOAD_PARAMETERS_REVISION_2))\r
     {       \r
         ASSERT(FALSE);\r
-        IPOIB_PRINT(TRACE_LEVEL_ERROR, IPOIB_DBG_OID, ("Set offloading task Illegal header\n"));\r
+        IPOIB_PRINT(TRACE_LEVEL_ERROR, IPOIB_DBG_OID,\r
+                       ("Set offloading task Illegal header\n"));\r
         Status = NDIS_STATUS_INVALID_DATA;\r
         goto Exit;\r
     }\r
@@ -1784,17 +1799,18 @@ InitNdisScatterGatherDma(
        status = NdisMRegisterScatterGatherDma(\r
                                        h_adapter,\r
                                        &DmaDescription,\r
-                                       &p_adapter->NdisMiniportDmaHandle);\r
+                                       &p_adapter->NdisMiniportDmaHandle );\r
 \r
        if( status != NDIS_STATUS_SUCCESS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                                                ("NdisMRegisterScatterGatherDma returned 0x%.8x.\n", status) );\r
+                                ("NdisMRegisterScatterGatherDma returned 0x%.8x.\n", status) );\r
                return status;\r
                \r
        }\r
-       //NDIS sets this value before it returns from NdisMRegisterScatterGatherDma. \r
-       //Miniport drivers should use this size to preallocate memory for each scatter/gather list. \r
+       //NDIS sets this value before it returns from NdisMRegisterScatterGatherDma.\r
+       //Miniport drivers should use this size to preallocate memory for each\r
+       // scatter/gather list. \r
        p_adapter->sg_list_size = DmaDescription.ScatterGatherListSize ;\r
        \r
        return status;\r
@@ -1984,7 +2000,8 @@ ipoib_check_for_hang(
                        ++(p_adapter->p_port->n_no_progress);\r
                        if (p_adapter->p_port->n_no_progress >= 4)\r
                        {\r
-                               IPOIB_PRINT( TRACE_LEVEL_ERROR,IPOIB_DBG_ERROR, ("port got stuck, reseting it !!!\n"));\r
+                               IPOIB_PRINT( TRACE_LEVEL_ERROR,IPOIB_DBG_ERROR,\r
+                                       ("port got stuck, reseting it !!!\n"));\r
                                //CL_ASSERT(FALSE); //?????\r
                                p_adapter->hung = TRUE;\r
                        }\r
@@ -2190,11 +2207,14 @@ ipoib_query_info(
        \r
                case OID_GEN_TRANSMIT_BUFFER_SPACE:\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
-                               ("Port %d received query for OID_GEN_TRANSMIT_BUFFER_SPACE\n", port_num) );\r
+                               ("Port %d received query for OID_GEN_TRANSMIT_BUFFER_SPACE\n",\r
+                               port_num) );\r
                        if( p_adapter->params.cm_enabled )\r
-                               info = p_adapter->params.sq_depth * p_adapter->params.cm_xfer_block_size;\r
+                               info = p_adapter->params.sq_depth\r
+                                                       * p_adapter->params.cm_xfer_block_size;\r
                        else\r
-                               info = p_adapter->params.sq_depth * p_adapter->params.xfer_block_size;\r
+                               info = p_adapter->params.sq_depth\r
+                                                       * p_adapter->params.xfer_block_size;\r
                        break;\r
        \r
                case OID_GEN_RECEIVE_BUFFER_SPACE:\r
@@ -2202,9 +2222,11 @@ ipoib_query_info(
                                ("Port %d received query for OID_GEN_TRANSMIT_BUFFER_SPACE "\r
                                "or OID_GEN_RECEIVE_BUFFER_SPACE\n", port_num) );\r
                        if( p_adapter->params.cm_enabled )\r
-                               info = p_adapter->params.rq_depth * p_adapter->params.cm_xfer_block_size;\r
+                               info = p_adapter->params.rq_depth\r
+                                                       * p_adapter->params.cm_xfer_block_size;\r
                        else\r
-                               info = p_adapter->params.rq_depth * p_adapter->params.xfer_block_size;\r
+                               info = p_adapter->params.rq_depth\r
+                                                       * p_adapter->params.xfer_block_size;\r
                        break;\r
        \r
                case OID_GEN_MAXIMUM_LOOKAHEAD:\r
@@ -2212,16 +2234,17 @@ ipoib_query_info(
                case OID_GEN_TRANSMIT_BLOCK_SIZE:\r
                case OID_GEN_RECEIVE_BLOCK_SIZE:\r
                case OID_GEN_MAXIMUM_TOTAL_SIZE:\r
-                       IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
-                               ("Port %d received query for OID_GEN_MAXIMUM_LOOKAHEAD "\r
-                               "or OID_GEN_CURRENT_LOOKAHEAD or "\r
-                               "OID_GEN_TRANSMIT_BLOCK_SIZE or "\r
-                               "OID_GEN_RECEIVE_BLOCK_SIZE or "\r
-                               "OID_GEN_MAXIMUM_TOTAL_SIZE\n", port_num) );\r
                        if( p_adapter->params.cm_enabled )\r
                                info = p_adapter->params.cm_xfer_block_size;\r
                        else\r
                                info = p_adapter->params.xfer_block_size;\r
+\r
+                       IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
+                               ("Port %d received query for 1 of OID_GEN_MAXIMUM_LOOKAHEAD, "\r
+                               "_CURRENT_LOOKAHEAD, "\r
+                               "_TRANSMIT_BLOCK_SIZE, "\r
+                               "_RECEIVE_BLOCK_SIZE, "\r
+                               "_GEN_MAXIMUM_TOTAL_SIZE = %d\n", port_num, info) );\r
                        break;\r
        \r
                case OID_GEN_VENDOR_ID:\r
@@ -2233,14 +2256,16 @@ ipoib_query_info(
        \r
                case OID_GEN_VENDOR_DESCRIPTION:\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID, \r
-                               ("Port %d received query for OID_GEN_VENDOR_DESCRIPTION\n", port_num) );\r
+                               ("Port %d received query for OID_GEN_VENDOR_DESCRIPTION\n",\r
+                               port_num) );\r
                        src_buf = VENDOR_DESCRIPTION;\r
                        buf_len = sizeof(VENDOR_DESCRIPTION);\r
                        break;\r
        \r
                case OID_GEN_VENDOR_DRIVER_VERSION:\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
-                               ("Port %d received query for OID_GEN_VENDOR_DRIVER_VERSION\n", port_num) );\r
+                               ("Port %d received query for OID_GEN_VENDOR_DRIVER_VERSION\n",\r
+                               port_num) );\r
                        src_buf = &version;\r
                        buf_len = sizeof(version);\r
                        //TODO: Figure out what the right version is.\r
@@ -2249,19 +2274,22 @@ ipoib_query_info(
        \r
                case OID_GEN_PHYSICAL_MEDIUM:\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
-                               ("Port %d received query for OID_GEN_PHYSICAL_MEDIUM\n", port_num) );\r
+                               ("Port %d received query for OID_GEN_PHYSICAL_MEDIUM\n",\r
+                               port_num) );\r
                        info = NdisPhysicalMediumUnspecified;\r
                        break;\r
        \r
                case OID_GEN_CURRENT_PACKET_FILTER:\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
-                               ("Port %d received query for OID_GEN_CURRENT_PACKET_FILTER\n", port_num) );\r
+                               ("Port %d received query for OID_GEN_CURRENT_PACKET_FILTER\n",\r
+                               port_num) );\r
                        info = p_adapter->packet_filter;\r
                        break;\r
        \r
                case OID_GEN_DRIVER_VERSION:\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
-                               ("Port %d received query for OID_GEN_DRIVER_VERSION\n", port_num) );\r
+                               ("Port %d received query for OID_GEN_DRIVER_VERSION\n",\r
+                               port_num) );\r
                        src_buf = &version;\r
                        buf_len = sizeof(version);\r
                        version = MAJOR_NDIS_VERSION << 8 | MINOR_NDIS_VERSION;\r
@@ -2283,7 +2311,8 @@ ipoib_query_info(
        \r
                case OID_GEN_MEDIA_CONNECT_STATUS:\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
-                               ("Port %d received query for OID_GEN_MEDIA_CONNECT_STATUS\n", port_num) );\r
+                               ("Port %d received query for OID_GEN_MEDIA_CONNECT_STATUS\n",\r
+                               port_num) );\r
                        cl_obj_lock( &p_adapter->obj );\r
                        switch( p_adapter->state )\r
                        {\r
@@ -2324,7 +2353,8 @@ ipoib_query_info(
        \r
                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
+                               ("Port %d received query for OID_GEN_MAXIMUM_SEND_PACKETS\n",\r
+                               port_num) );\r
                        info = MINIPORT_MAX_SEND_PACKETS;\r
                        break;\r
        \r
@@ -2465,14 +2495,14 @@ ipoib_query_info(
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
                                ("Port %d received query for OID_802_3_PERMANENT_ADDRESS\n", port_num) );\r
                        src_buf = &p_adapter->mac;\r
-               buf_len = sizeof(p_adapter->mac);\r
+                       buf_len = sizeof(p_adapter->mac);\r
                        break;\r
        \r
                case OID_802_3_CURRENT_ADDRESS:\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
                                ("Port %d received query for OID_802_3_CURRENT_ADDRESS\n", port_num) );\r
                        src_buf = &p_adapter->params.conf_mac;\r
-               buf_len = sizeof(p_adapter->params.conf_mac);\r
+                       buf_len = sizeof(p_adapter->params.conf_mac);\r
                        break;\r
        \r
                case OID_802_3_MULTICAST_LIST:\r
@@ -2517,10 +2547,14 @@ ipoib_query_info(
             break;                     \r
                case OID_GEN_INTERRUPT_MODERATION:\r
             InterruptModerationParam.Header.Type = NDIS_OBJECT_TYPE_DEFAULT;\r
-            InterruptModerationParam.Header.Revision = NDIS_INTERRUPT_MODERATION_PARAMETERS_REVISION_1;\r
-            InterruptModerationParam.Header.Size = NDIS_SIZEOF_INTERRUPT_MODERATION_PARAMETERS_REVISION_1;\r
-            InterruptModerationParam.Flags = NDIS_INTERRUPT_MODERATION_CHANGE_NEEDS_RESET ;\r
-            InterruptModerationParam.InterruptModeration = NdisInterruptModerationNotSupported ;       \r
+            InterruptModerationParam.Header.Revision =\r
+                                                       NDIS_INTERRUPT_MODERATION_PARAMETERS_REVISION_1;\r
+            InterruptModerationParam.Header.Size =\r
+                                               NDIS_SIZEOF_INTERRUPT_MODERATION_PARAMETERS_REVISION_1;\r
+            InterruptModerationParam.Flags =\r
+                                                               NDIS_INTERRUPT_MODERATION_CHANGE_NEEDS_RESET;\r
+            InterruptModerationParam.InterruptModeration =\r
+                                                                               NdisInterruptModerationNotSupported;\r
             buf_len = sizeof(NDIS_INTERRUPT_MODERATION_PARAMETERS);\r
             src_buf = (PVOID) &InterruptModerationParam;  \r
             break;\r
@@ -2546,7 +2580,8 @@ ipoib_query_info(
                case OID_PNP_CAPABILITIES:\r
                        status = NDIS_STATUS_NOT_SUPPORTED;\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
-                               ("Port %d received an unsupported oid of 0x%.8X!\n", port_num, oid_info.oid) );\r
+                               ("Port %d received an unsupported Optional oid of 0x%.8X!\n",\r
+                               port_num, oid_info.oid) );\r
                        break;\r
        \r
                case OID_GEN_PROTOCOL_OPTIONS:\r
@@ -2554,7 +2589,10 @@ ipoib_query_info(
                case OID_GEN_TRANSPORT_HEADER_OFFSET:\r
                case OID_PNP_ENABLE_WAKE_UP:\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
-                               ("Port %d received query for OID_GEN_PROTOCOL_OPTIONS or OID_GEN_NETWORK_LAYER_ADDRESSES or OID_GEN_TRANSPORT_HEADER_OFFSET  OID_PNP_ENABLE_WAKE_UPn", port_num) );\r
+                               ("Port %d received query for OID_GEN_PROTOCOL_OPTIONS or "\r
+                                "OID_GEN_NETWORK_LAYER_ADDRESSES or "\r
+                                "OID_GEN_TRANSPORT_HEADER_OFFSET  OID_PNP_ENABLE_WAKE_UP\n",\r
+                               port_num) );\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
                                ("Number of OID: 0x%.8X!\n", oid_info.oid) );\r
                        status = NDIS_STATUS_SUCCESS; \r
@@ -2569,7 +2607,8 @@ ipoib_query_info(
        \r
                case OID_TCP_OFFLOAD_CURRENT_CONFIG:\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
-                               ("Port %d received query for OID_PNP_QUERY_POWER\n", port_num) );\r
+                               ("Port %d received query for OID_TCP_OFFLOAD_CURRENT_CONFIG\n",\r
+                                       port_num) );\r
                                //ulBytesAvailable = ulInfoLen = sizeof(NDIS_OFFLOAD);\r
                                if (oid_info.buf_len <  sizeof(NDIS_OFFLOAD))\r
                                {\r
@@ -2581,16 +2620,26 @@ ipoib_query_info(
                                OffloadConfig( p_adapter, &offload);\r
                                src_buf = &offload;\r
                                break;\r
+\r
                case OID_IP6_OFFLOAD_STATS:\r
                case OID_IP4_OFFLOAD_STATS:\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
-                               ("Port %d received query for UNSUPPORTED OID_IP[4,6]_OFFLOAD_STATS\n", port_num) );\r
+                               ("Port %d received query for UNSUPPORTED "\r
+                                "OID_IP[4,6]_OFFLOAD_STATS\n", port_num) );\r
+                       status = NDIS_STATUS_NOT_SUPPORTED;\r
+                       break;\r
+\r
+               case OID_GEN_MACHINE_NAME:\r
+                       IPOIB_PRINT( TRACE_LEVEL_INFORMATION,IPOIB_DBG_OID,\r
+                               ("Port %d received query OID_GEN_MACHINE_NAME\n", port_num) );\r
                        status = NDIS_STATUS_NOT_SUPPORTED;\r
                        break;\r
+\r
                default:\r
                        status = NDIS_STATUS_INVALID_OID;\r
                        IPOIB_PRINT( TRACE_LEVEL_ERROR,IPOIB_DBG_ERROR,\r
-                               ("Port %d received an invalid oid of 0x%.8X!\n", port_num, oid_info.oid) );\r
+                               ("Port %d received an invalid oid of 0x%.8X!\n",\r
+                               port_num, oid_info.oid) );\r
                        break;\r
                }\r
        \r
@@ -2602,8 +2651,11 @@ ipoib_query_info(
                 */\r
                if( status != NDIS_STATUS_PENDING )\r
                {\r
-                       return ipoib_complete_query(\r
-                               p_adapter, &oid_info, status, src_buf, buf_len );\r
+                       return ipoib_complete_query( p_adapter,\r
+                                                                                &oid_info,\r
+                                                                                status,\r
+                                                                                src_buf,\r
+                                                                                buf_len );\r
                }\r
        \r
                IPOIB_EXIT( IPOIB_DBG_OID );\r
@@ -2666,8 +2718,6 @@ ipoib_complete_query(
        p_adapter->pending_query = FALSE;\r
        IPOIB_EXIT( IPOIB_DBG_OID );\r
        return oid_status;\r
-\r
-       \r
 }\r
 \r
 static\r
@@ -2930,8 +2980,9 @@ ipoib_set_info(
                }\r
                else\r
                {\r
-                       ipoib_refresh_mcast( p_adapter, (mac_addr_t*)info_buf,\r
-                               (uint8_t)(info_buf_len / sizeof(mac_addr_t)) );\r
+                       ipoib_refresh_mcast( p_adapter,\r
+                                                                (mac_addr_t*)info_buf,\r
+                                                                (uint8_t)(info_buf_len / sizeof(mac_addr_t)) );\r
 \r
                        buf_len = info_buf_len;\r
                        /*\r
@@ -3065,23 +3116,23 @@ ipoib_oid_handler(
        return status;\r
 }\r
 \r
-//! Transfers some number of packets, specified as an array of packet pointers,\r
-//  over the network. \r
-/*  For a deserialized driver, these packets are completed asynchronously\r
-using NdisMSendComplete.\r
-IRQL <= DISPATCH_LEVEL\r
+/* Transfers some number of packets, specified as an array of packet pointers,\r
+ *  over the network. \r
+ *  For a deserialized driver, these packets are completed asynchronously\r
+ *  using NdisMSendComplete.\r
+ * IRQL <= DISPATCH_LEVEL\r
 \r
-@param adapter_context Pointer to ipoib_adapter_t structure with per NIC state\r
-@param packet_array Array of packets to send\r
-@param numPackets Number of packets in the array\r
+ @param adapter_context - Pointer to ipoib_adapter_t structure with per NIC state\r
+ @param net_buffer_list - Array of packets to send\r
+ @param port_num - miniport number.\r
+ @param send_flags - NDIS send flags.\r
 */\r
 void\r
 ipoib_send_net_buffer_list(\r
     IN  NDIS_HANDLE         adapter_context,\r
     IN  PNET_BUFFER_LIST    net_buffer_list,\r
     IN  NDIS_PORT_NUMBER    port_num,\r
-    IN  ULONG               send_flags\r
-    )\r
+    IN  ULONG               send_flags )\r
 {\r
        ipoib_adapter_t         *p_adapter;\r
        ipoib_port_t            *p_port;\r
@@ -3142,9 +3193,12 @@ ipoib_send_net_buffer_list(
         NET_BUFFER_LIST_NEXT_NBL(curr_net_buffer_list) = NULL;\r
                \r
                cl_perf_start( PortSend );\r
-               IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND,\r
-                               ("Sending NBL=%p, g_NBL=%d, g_NBL_completed=%d \n", curr_net_buffer_list, g_NBL, g_NBL_complete) );\r
+               IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_BUF,\r
+                               ("Sending NBL=%p, g_NBL=%d, g_NBL_completed=%d \n",\r
+                               curr_net_buffer_list, g_NBL, g_NBL_complete) );\r
+\r
                ipoib_port_send( p_port, curr_net_buffer_list, send_flags);\r
+\r
                cl_perf_stop( &p_adapter->perf, PortSend );\r
        }\r
        ipoib_port_deref( p_port, ref_send_packets );\r
@@ -3158,7 +3212,8 @@ compl_status:
        {\r
 \r
                IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                               ("Got bad status, g_NBL=%d, g_NBL_completed=%d \n", g_NBL, g_NBL_complete) );\r
+                               ("Got bad status, g_NBL=%d, g_NBL_completed=%d \n",\r
+                               g_NBL, g_NBL_complete) );\r
                send_complete_flags = 0;\r
            \r
                for (curr_net_buffer_list = net_buffer_list;\r
@@ -3176,16 +3231,17 @@ compl_status:
                if (NDIS_TEST_SEND_AT_DISPATCH_LEVEL(send_flags))\r
                {\r
                        ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);\r
-                       NDIS_SET_SEND_COMPLETE_FLAG(send_complete_flags, NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL);\r
+                       NDIS_SET_SEND_COMPLETE_FLAG(send_complete_flags,\r
+                                                                       NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL);\r
                }\r
-               NdisMSendNetBufferListsCompleteX(\r
-                       p_adapter,\r
-                       net_buffer_list,\r
-                       send_complete_flags); \r
+               NdisMSendNetBufferListsCompleteX( p_adapter,\r
+                                                                                 net_buffer_list,\r
+                                                                                 send_complete_flags); \r
        }\r
        IPOIB_EXIT( IPOIB_DBG_SEND );\r
 }\r
 \r
+\r
 void\r
 ipoib_pnp_notify(\r
        IN                              NDIS_HANDLE                                     adapter_context,\r
@@ -3757,7 +3813,8 @@ ipoib_reg_addrs(
                /* Take a reference for each service request. */\r
                cl_obj_ref(&p_adapter->obj);\r
                        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_OBJ,\r
-                               ("[%p] Adapter refcount raised to %d\n", p_adapter, p_adapter->obj.ref_cnt));\r
+                               ("[%p] Adapter refcount raised to %d\n",\r
+                                       p_adapter, p_adapter->obj.ref_cnt));\r
                ib_status = p_adapter->p_ifc->reg_svc(\r
                        p_adapter->h_al, &ib_service, &p_addr_item->p_reg->h_reg_svc );\r
                if( ib_status != IB_SUCCESS )\r
@@ -3779,8 +3836,8 @@ ipoib_reg_addrs(
                        {\r
                                /* Fatal error. */\r
                                IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                                       ("Port %d OID_GEN_NETWORK_LAYER_ADDRESSES - Failed to register IP Address "\r
-                                       "of %d.%d.%d.%d with error %s\n",\r
+                                       ("Port %d OID_GEN_NETWORK_LAYER_ADDRESSES - Failed to "\r
+                                        "register IP Address of %d.%d.%d.%d with error %s\n",\r
                                        port_num,\r
                                        p_addr_item->address.as_bytes[0],\r
                                        p_addr_item->address.as_bytes[1],\r
@@ -3902,7 +3959,8 @@ __ipoib_ats_reg_cb(
        cl_obj_unlock( &p_reg->p_adapter->obj );\r
        cl_obj_deref(&p_reg->p_adapter->obj);\r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_OBJ,\r
-                       ("Adapter[%p] refcnt decremented to %d\n", p_reg->p_adapter, p_reg->p_adapter->obj.ref_cnt));\r
+               ("Adapter[%p] refcnt decremented to %d\n",\r
+                       p_reg->p_adapter, p_reg->p_adapter->obj.ref_cnt));\r
 \r
        IPOIB_EXIT( IPOIB_DBG_OID );\r
 }\r
index 5fc7d0988433c77e92ef423746251e6fe33ff572..be747727000be4170fa7a253650ede63a7f6278d 100644 (file)
@@ -166,12 +166,15 @@ ipoib_endpt_create(
 \r
        cl_obj_construct( &p_endpt->obj, IPOIB_OBJ_ENDPOINT );\r
 \r
-       status = cl_obj_init( &p_endpt->obj, CL_DESTROY_ASYNC,\r
-               __endpt_destroying, __endpt_cleanup, __endpt_free );\r
+       status = cl_obj_init( &p_endpt->obj,\r
+                                                 CL_DESTROY_ASYNC,\r
+                                                 __endpt_destroying,\r
+                                                 __endpt_cleanup,\r
+                                                 __endpt_free );\r
 \r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,\r
-               ("Created endpoint: [ %p ] DLID: %#x QPN: %#x \n", \r
-               p_endpt, cl_ntoh16(dlid), cl_ntoh32(qpn) ) );\r
+               ("Created EndPoint %p DLID: %#x QPN: %#x \n", \r
+                       p_endpt, cl_ntoh16(dlid), cl_ntoh32(qpn) ) );\r
 \r
        p_endpt->dgid = *p_dgid;\r
        p_endpt->dlid = dlid;\r
@@ -212,7 +215,8 @@ __create_mcast_av(
                ib_grh_set_ver_class_flow( 6, p_member_rec->tclass, flow_lbl );\r
        av_attr.static_rate = p_member_rec->rate & IB_PATH_REC_BASE_MASK;\r
        av_attr.path_bits = 0;\r
-       /* port is not attached to endpoint at this point, so use endpt ifc reference */\r
+       /* port is not attached to endpoint at this point, so use endpt ifc\r
+       reference */\r
        status = p_endpt->p_ifc->create_av( h_pd, &av_attr, ph_av );\r
 \r
        if( status != IB_SUCCESS )\r
@@ -276,8 +280,8 @@ __endpt_destroying(
        cl_obj_lock( p_obj );\r
        if( p_endpt->h_query )\r
        {\r
-               p_port->p_adapter->p_ifc->cancel_query(\r
-                       p_port->p_adapter->h_al, p_endpt->h_query );\r
+               p_port->p_adapter->p_ifc->cancel_query( p_port->p_adapter->h_al,\r
+                                                                                               p_endpt->h_query );\r
                p_endpt->h_query = NULL;\r
        }\r
 \r
@@ -287,7 +291,8 @@ __endpt_destroying(
                IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,\r
                        ("Leaving MCast group\n") );\r
                ipoib_port_ref(p_port, ref_leave_mcast);\r
-               p_port->p_adapter->p_ifc->leave_mcast( p_endpt->h_mcast, ipoib_leave_mcast_cb );\r
+               p_port->p_adapter->p_ifc->leave_mcast( p_endpt->h_mcast,\r
+                                                                                          ipoib_leave_mcast_cb );\r
        }\r
 #if 0\r
        else if( p_port->p_adapter->params.cm_enabled )\r
@@ -383,26 +388,26 @@ ipoib_endpt_queue(
                 * can receive packets, and NDIS can try to respond.  We need to delay\r
                 * a response until the MC callback runs and sets the AV.\r
                 */\r
-               IPOIB_PRINT( TRACE_LEVEL_WARNING, IPOIB_DBG_MCAST ,("Got the race between the mcast callback and a receive/send\n"));\r
-               IPOIB_PRINT( TRACE_LEVEL_WARNING, IPOIB_DBG_SEND ,("Got the race between the mcast callback and a receive/send\n"));\r
+               IPOIB_PRINT( TRACE_LEVEL_WARNING, IPOIB_DBG_MCAST ,\r
+                       ("Got the race between the mcast callback and a receive/send\n"));\r
+               IPOIB_PRINT( TRACE_LEVEL_WARNING, IPOIB_DBG_SEND ,\r
+                       ("Got the race between the mcast callback and a receive/send\n"));\r
                ipoib_endpt_deref( p_endpt );\r
                IPOIB_EXIT( IPOIB_DBG_ENDPT );\r
                return NDIS_STATUS_PENDING;\r
        }\r
 \r
-       /* This is the first packet for this endpoint.  Create the AV. */\r
+       /* This is the first packet for this endpoint. Create the AV. */\r
        p_port = __endpt_parent( p_endpt );\r
 \r
        cl_memclr( &av_attr, sizeof(ib_av_attr_t) );\r
 \r
        av_attr.port_num = p_port->port_num;\r
 \r
-       ib_member_get_sl_flow_hop(\r
-               p_port->ib_mgr.bcast_rec.sl_flow_hop,\r
-               &av_attr.sl,\r
-               &flow_lbl,\r
-               &av_attr.grh.hop_limit\r
-               );\r
+       ib_member_get_sl_flow_hop( p_port->ib_mgr.bcast_rec.sl_flow_hop,\r
+                                                          &av_attr.sl,\r
+                                                          &flow_lbl,\r
+                                                          &av_attr.grh.hop_limit );\r
 \r
        av_attr.dlid = p_endpt->dlid;\r
 \r
@@ -419,15 +424,17 @@ ipoib_endpt_queue(
                6, p_port->ib_mgr.bcast_rec.tclass, flow_lbl );\r
        av_attr.grh.resv1 = 0;\r
        av_attr.grh.resv2 = 0;\r
-       ib_gid_set_default( &av_attr.grh.src_gid, p_port->p_adapter->guids.port_guid.guid );\r
+       ib_gid_set_default( &av_attr.grh.src_gid,\r
+                                               p_port->p_adapter->guids.port_guid.guid );\r
        av_attr.grh.dest_gid = p_endpt->dgid;\r
 \r
        av_attr.static_rate = p_port->ib_mgr.bcast_rec.rate;\r
        av_attr.path_bits = 0;\r
 \r
        /* Create the AV. */\r
-       status = p_port->p_adapter->p_ifc->create_av(\r
-               p_port->ib_mgr.h_pd, &av_attr, &p_endpt->h_av );\r
+       status = p_port->p_adapter->p_ifc->create_av( p_port->ib_mgr.h_pd,\r
+                                                                                                 &av_attr,\r
+                                                                                                 &p_endpt->h_av );\r
        if( status != IB_SUCCESS )\r
        {\r
                p_port->p_adapter->hung = TRUE;\r
@@ -493,10 +500,8 @@ endpt_cm_buf_mgr_init(
        {\r
                NdisWriteErrorLogEntry( p_port->p_adapter->h_adapter,\r
                        EVENT_IPOIB_RECV_POOL, 1, cl_status );\r
-               \r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_qpool_init for cm recvs returned %#x\n", cl_status) );\r
-               \r
+                       ("cl_qpool_init(cm_buf_mgr.recv_pool) returned %#x\n", cl_status) );\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -541,9 +546,8 @@ endpt_cm_buf_mgr_init(
 \r
        if( !p_port->cm_recv_mgr.recv_NBL_array )\r
        {\r
-               //NDIS60\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_zalloc for NET_BUFFER_LIST array failed.\n") );\r
+                       ("cl_zalloc for cm_recv_mgr NET_BUFFER_LIST array failed.\n") );\r
                \r
                ib_status = IB_INSUFFICIENT_MEMORY;\r
                goto pkt_array_failed;\r
@@ -552,6 +556,7 @@ endpt_cm_buf_mgr_init(
        p_port->cm_buf_mgr.pool_init = TRUE;\r
        return IB_SUCCESS;\r
 \r
+\r
 pkt_array_failed:\r
        if( p_port->cm_buf_mgr.h_buffer_pool )\r
                NdisFreeBufferPool( p_port->cm_buf_mgr.h_buffer_pool );\r
@@ -565,6 +570,7 @@ pkt_pool_failed:
        return ib_status;\r
 }\r
 \r
+\r
 void\r
 endpt_cm_buf_mgr_reset(\r
        IN              ipoib_port_t* const             p_port )\r
@@ -647,7 +653,8 @@ __cm_recv_desc_ctor(
        if( p_desc->p_alloc_buf == NULL )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("Failed to allocate receive buffer size %d bytes.\n", p_desc->alloc_buf_size ) );\r
+                       ("Failed to allocate CM recv buffer size %d bytes.\n",\r
+                       p_desc->alloc_buf_size ) );\r
                return CL_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -655,16 +662,15 @@ __cm_recv_desc_ctor(
        create_mr.length  = p_desc->alloc_buf_size;\r
        create_mr.access_ctrl = IB_AC_LOCAL_WRITE;\r
 \r
-       \r
-       if( p_port->p_adapter->p_ifc->reg_mem( \r
-                                                       p_port->ib_mgr.h_pd,\r
-                                                       &create_mr,\r
-                                                       &p_desc->lkey,\r
-                                                       &rkey,\r
-                                                       &p_desc->h_mr ) != IB_SUCCESS )\r
+       if( p_port->p_adapter->p_ifc->reg_mem( p_port->ib_mgr.h_pd,\r
+                                                                                  &create_mr,\r
+                                                                                  &p_desc->lkey,\r
+                                                                                  &rkey,\r
+                                                                                  &p_desc->h_mr ) != IB_SUCCESS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("Failed to create Memory Region size %d bytes.\n", p_desc->alloc_buf_size ) );\r
+                       ("Failed to create Memory Region size %d bytes.\n",\r
+                       p_desc->alloc_buf_size ) );\r
                goto ctor_failed;\r
        }\r
        p_desc->p_buf = p_desc->p_alloc_buf + (BUF_ALIGN - sizeof( ipoib_hdr_t));\r
@@ -679,9 +685,11 @@ __cm_recv_desc_ctor(
        p_desc->wr.wr_id = (uintn_t)p_desc;\r
        p_desc->wr.ds_array = p_desc->local_ds;\r
        p_desc->wr.num_ds = 1;\r
+\r
        p_desc->type = PKT_TYPE_CM_UCAST;\r
        \r
        *pp_pool_item = &p_desc->item;\r
+\r
        return CL_SUCCESS;\r
 \r
 ctor_failed:\r
@@ -990,25 +998,28 @@ endpt_cm_recv_mgr_filter(
                        if( p_wc->length < (sizeof(ipoib_hdr_t) + sizeof(ipoib_arp_pkt_t)) )\r
                        {\r
                                IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                               ("Received ARP packet too short\n") );\r
+                               ("Received ARP packet too short (wc_len %d)\n", p_wc->length) );\r
                                ib_status = IB_ERROR;\r
                                break;\r
                        }\r
-                       ib_status = \r
-                               __endpt_cm_recv_arp( p_port, p_ipoib, p_eth, p_endpt );\r
+                       ib_status = __endpt_cm_recv_arp( p_port, p_ipoib, p_eth, p_endpt );\r
                        break;\r
+\r
                case ETH_PROT_TYPE_IP:\r
                        if( p_wc->length < (sizeof(ipoib_hdr_t) + sizeof(ip_hdr_t)) )\r
                        {\r
                                IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                                       ("Received IP packet too short\n") );\r
+                                       ("Received IP packet too short (wc_len %d)\n", p_wc->length) );\r
                                ib_status = IB_ERROR;\r
                                break;\r
                        }\r
                        if( p_ipoib->type.ip.hdr.prot == IP_PROT_UDP )\r
                        {\r
-                               ib_status = \r
-                                       __endpt_cm_recv_udp( p_port, p_wc, p_ipoib, p_eth, p_endpt );\r
+                               ib_status = __endpt_cm_recv_udp( p_port,\r
+                                                                                                p_wc,\r
+                                                                                                p_ipoib,\r
+                                                                                                p_eth,\r
+                                                                                                p_endpt );\r
                        }\r
                \r
                        break;\r
@@ -1151,8 +1162,11 @@ __endpt_cm_recv_udp(
        }\r
        if( __cm_recv_is_dhcp( p_ipoib ) )\r
        {\r
-               ib_status = ipoib_recv_dhcp(\r
-                       p_port, p_ipoib, p_eth, p_src_endpt, p_port->p_local_endpt );\r
+               ib_status = ipoib_recv_dhcp( p_port,\r
+                                                                        p_ipoib,\r
+                                                                        p_eth,\r
+                                                                        p_src_endpt,\r
+                                                                        p_port->p_local_endpt );\r
        }\r
 \r
        return ib_status;\r
index a6d25e82343dd624a7815ffe865124b54ef68690..6f027a00332b389ab5dfb1c697f1042dea667ba6 100644 (file)
@@ -197,7 +197,7 @@ ipoib_endpt_ref(
        cl_obj_ref( &p_endpt->obj );\r
 #if DBG\r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_OBJ,\r
-                               ("[%p] Endpt refcount raised to %d\n", p_endpt, p_endpt->obj.ref_cnt));\r
+               ("[%#x] Endpt refcount raised to %d\n", p_endpt, p_endpt->obj.ref_cnt));\r
 #endif\r
        /*\r
         * Anytime we reference the endpoint, we're either receiving data\r
@@ -215,7 +215,7 @@ ipoib_endpt_deref(
        cl_obj_deref( &p_endpt->obj );\r
 #if DBG\r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_OBJ,\r
-                               ("[%p] Endpt refcount decremented to %d\n", p_endpt, p_endpt->obj.ref_cnt));\r
+               ("[%#x] Endpt refcount decremented to %d\n", p_endpt, p_endpt->obj.ref_cnt));\r
 #endif\r
 }\r
 \r
@@ -233,7 +233,7 @@ endpt_cm_set_state(
        IN              ipoib_endpt_t* const            p_endpt,\r
        IN              cm_state_t                                      state )\r
 {\r
-       return(cm_state_t)InterlockedExchange( \r
+       return (cm_state_t)InterlockedExchange( \r
                                (volatile LONG *)&p_endpt->conn.state, \r
                                (LONG)state );\r
 }\r
index 8def696c998331bac17da92f5ecbdb136dcf5d6a..b14ef2385187fefacbef9027b6806b12b1dbff0e 100644 (file)
@@ -580,7 +580,7 @@ inline void ipoib_port_ref( ipoib_port_t * p_port, int type )
 #if DBG\r
        cl_atomic_inc( &p_port->ref[type % ref_mask] );\r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_OBJ,\r
-                               ("Port[%d] refcount raised to %d\n", p_port->port_num, p_port->obj.ref_cnt));\r
+                       ("Port[%d] refcount raised to %d\n", p_port->port_num, p_port->obj.ref_cnt));\r
 \r
        if ((p_port->obj.ref_cnt % 20)==0)\r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_OBJ,\r
@@ -597,7 +597,8 @@ inline void ipoib_port_deref(ipoib_port_t * p_port, int type)
 #if DBG\r
        cl_atomic_dec( &p_port->ref[type % ref_mask] );\r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_OBJ,\r
-                               ("Port[%d] refcount decremented to %d\n", p_port->port_num, p_port->obj.ref_cnt));\r
+               ("Port[%d] refcount-- to %d\n", p_port->port_num, p_port->obj.ref_cnt));\r
+\r
        if ((p_port->obj.ref_cnt % 20) == 0)\r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_OBJ,\r
                ("deref type %d ref_cnt %d\n", type, p_port->obj.ref_cnt) );\r
@@ -943,11 +944,7 @@ static void
 __ib_mgr_construct(\r
        IN                              ipoib_port_t* const                     p_port )\r
 {\r
-       IPOIB_ENTER( IPOIB_DBG_INIT );\r
-\r
        cl_memclr( &p_port->ib_mgr, sizeof(ipoib_ib_mgr_t) );\r
-\r
-       IPOIB_EXIT( IPOIB_DBG_INIT );\r
 }\r
 \r
 \r
@@ -967,16 +964,18 @@ __ib_mgr_init(
        IPOIB_ENTER( IPOIB_DBG_INIT );\r
 \r
        /* Open the CA. */\r
-       status = p_port->p_adapter->p_ifc->open_ca(\r
-               p_port->p_adapter->h_al, p_port->p_adapter->guids.ca_guid,\r
-               NULL, p_port, &p_port->ib_mgr.h_ca );\r
+       status = p_port->p_adapter->p_ifc->open_ca( p_port->p_adapter->h_al,\r
+                                                                                               p_port->p_adapter->guids.ca_guid,\r
+                                                                                               NULL,\r
+                                                                                               p_port,\r
+                                                                                               &p_port->ib_mgr.h_ca );\r
        if( status != IB_SUCCESS )\r
        {\r
                NdisWriteErrorLogEntry( p_port->p_adapter->h_adapter,\r
                        EVENT_IPOIB_OPEN_CA, 1, status );\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("ib_open_ca returned %s\n", \r
-                       p_port->p_adapter->p_ifc->get_err_str( status )) );\r
+                       ("ib_open_ca(port %p) returns %s\n", \r
+                       p_port, p_port->p_adapter->p_ifc->get_err_str( status )) );\r
                return status;\r
        }\r
 \r
@@ -991,20 +990,23 @@ __ib_mgr_init(
        if( p_port->p_adapter->params.cm_enabled )\r
        {\r
                uint32_t payload_mtu = __port_attr_to_mtu_size( \r
-                       p_port->p_ca_attrs->p_port_attr[p_port->port_num - 1].mtu )\r
-                       - sizeof(ipoib_hdr_t);\r
+                                       p_port->p_ca_attrs->p_port_attr[p_port->port_num - 1].mtu )\r
+                                       - sizeof(ipoib_hdr_t);\r
+\r
                /* adjust ipoib UD payload MTU to actual port MTU size. */\r
                p_port->p_adapter->params.payload_mtu = \r
-                               max( DEFAULT_PAYLOAD_MTU, payload_mtu );\r
+                                                                               max( DEFAULT_PAYLOAD_MTU, payload_mtu );\r
                p_port->p_adapter->params.xfer_block_size = \r
                        (sizeof(eth_hdr_t) + p_port->p_adapter->params.payload_mtu);\r
        }\r
 #endif\r
+\r
 #if IPOIB_USE_DMA\r
        /* init DMA only once while running MiniportInitialize */\r
        if ( !p_port->p_adapter->reset )\r
        {\r
                ULONG max_phys_mapping;\r
+\r
                if( p_port->p_adapter->params.cm_enabled )\r
                {\r
                        max_phys_mapping = p_port->p_adapter->params.cm_xfer_block_size;\r
@@ -1199,7 +1201,7 @@ __ib_mgr_init(
                else \r
                {\r
                        if ( p_port->p_adapter->params.send_chksum_offload )\r
-                       p_port->p_adapter->params.send_chksum_offload = CSUM_DISABLED;\r
+                               p_port->p_adapter->params.send_chksum_offload = CSUM_DISABLED;\r
                }\r
        }\r
 #endif\r
@@ -1378,8 +1380,6 @@ static void
 __buf_mgr_construct(\r
        IN                              ipoib_port_t* const                     p_port )\r
 {\r
-       IPOIB_ENTER( IPOIB_DBG_INIT );\r
-\r
        cl_qpool_construct( &p_port->buf_mgr.recv_pool );\r
 \r
        p_port->buf_mgr.h_packet_pool = NULL;\r
@@ -1389,8 +1389,6 @@ __buf_mgr_construct(
                NULL, NULL, 0, MAX_LSO_PAYLOAD_MTU, 'bipi', 0 );\r
 \r
        p_port->buf_mgr.h_send_pkt_pool = NULL;\r
-\r
-       IPOIB_EXIT( IPOIB_DBG_INIT );\r
 }\r
 \r
 \r
@@ -1411,7 +1409,7 @@ __buf_mgr_init(
 \r
        /* Allocate the receive descriptor pool */\r
        cl_status = cl_qpool_init( &p_port->buf_mgr.recv_pool,\r
-               p_params->rq_depth * p_params->recv_pool_ratio,\r
+                                                          p_params->rq_depth * p_params->recv_pool_ratio,\r
 #if IPOIB_INLINE_RECV\r
                0, 0, sizeof(ipoib_recv_desc_t), __recv_ctor, NULL, p_port );\r
 #else  /* IPOIB_INLINE_RECV */\r
@@ -1439,8 +1437,8 @@ __buf_mgr_init(
        pool_parameters.DataSize = 0;\r
 \r
     p_port->buf_mgr.h_packet_pool = NdisAllocateNetBufferListPool(\r
-                p_port->p_adapter->h_adapter,\r
-                &pool_parameters); \r
+                                                                                               p_port->p_adapter->h_adapter,\r
+                                                                                               &pool_parameters ); \r
 \r
        if( !p_port->buf_mgr.h_packet_pool )\r
        {\r
@@ -1455,8 +1453,8 @@ __buf_mgr_init(
     pool_parameters.PoolTag = 'XTPI';\r
 \r
     p_port->buf_mgr.h_send_pkt_pool = NdisAllocateNetBufferListPool(\r
-                p_port->p_adapter->h_adapter,\r
-                &pool_parameters); \r
+                                                                                               p_port->p_adapter->h_adapter,\r
+                                                                                               &pool_parameters ); \r
        if( !p_port->buf_mgr.h_send_pkt_pool)\r
        {\r
                NdisWriteErrorLogEntry( p_port->p_adapter->h_adapter,\r
@@ -1548,8 +1546,8 @@ __recv_ctor(
        {\r
                /* The buffer crosses page boundaries. */\r
                p_desc->local_ds[0].length = ds0_len;\r
-               p_desc->local_ds[1].vaddr = cl_get_physaddr( \r
-                       ((uint8_t*)&p_desc->buf) + ds0_len );\r
+               p_desc->local_ds[1].vaddr =\r
+                                                       cl_get_physaddr( ((uint8_t*)&p_desc->buf) + ds0_len );\r
                p_desc->local_ds[1].lkey = p_port->ib_mgr.lkey;\r
                p_desc->local_ds[1].length = sizeof(recv_buf_t) - ds0_len;\r
                p_desc->wr.num_ds = 2;\r
@@ -1611,6 +1609,7 @@ __buf_mgr_get_recv(
        ipoib_recv_desc_t       *p_desc;\r
        IPOIB_ENTER( IPOIB_DBG_RECV );\r
        p_desc = (ipoib_recv_desc_t*)cl_qpool_get( &p_port->buf_mgr.recv_pool );\r
+\r
        /* Reference the port object for the send. */\r
        if( p_desc )\r
        {\r
@@ -1670,9 +1669,7 @@ __buf_mgr_put_recv_list(
        IN                              ipoib_port_t* const                     p_port,\r
        IN                              cl_qlist_t* const                       p_list )\r
 {\r
-       //IPOIB_ENTER(  IPOIB_DBG_RECV );\r
        cl_qpool_put_list( &p_port->buf_mgr.recv_pool, p_list );\r
-       //IPOIB_EXIT(  IPOIB_DBG_RECV );\r
 }\r
 \r
 \r
@@ -1731,13 +1728,8 @@ static void
 __recv_mgr_construct(\r
        IN                              ipoib_port_t* const                     p_port )\r
 {\r
-       IPOIB_ENTER( IPOIB_DBG_INIT );\r
-\r
        cl_qlist_init( &p_port->recv_mgr.done_list );\r
-\r
        p_port->recv_mgr.recv_NBL_array = NULL;\r
-\r
-       IPOIB_EXIT( IPOIB_DBG_INIT );\r
 }\r
 \r
 \r
@@ -1950,12 +1942,13 @@ ipoib_return_net_buffer_list(
        if ( !p_port ) {\r
                ASSERT(p_port);\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("return_NBL callback called when port pointer was already cleared\n") );\r
+                       ("<NULL> port pointer; already cleared?\n") );\r
                return;\r
        }\r
 \r
        cl_perf_start( ReturnPacket );\r
        cl_spinlock_acquire( &p_port->recv_lock );\r
+\r
        NBL_cnt = __free_received_NBL( p_port, p_net_buffer_lists );\r
 \r
        shutter_sub( &p_port->p_adapter->recv_shutter, -NBL_cnt );\r
@@ -2042,8 +2035,9 @@ __recv_cb(
                p_free = wc;\r
 \r
                cl_perf_start( PollRecv );\r
-               status = p_port->p_adapter->p_ifc->poll_cq(\r
-                       p_port->ib_mgr.h_recv_cq, &p_free, &p_wc );\r
+               status = p_port->p_adapter->p_ifc->poll_cq( p_port->ib_mgr.h_recv_cq,\r
+                                                                                                       &p_free,\r
+                                                                                                       &p_wc );\r
                cl_perf_stop( &p_port->p_adapter->perf, PollRecv );\r
                CL_ASSERT( status == IB_SUCCESS || status == IB_NOT_FOUND );\r
 \r
@@ -2086,8 +2080,7 @@ __recv_cb(
 \r
                cl_perf_start( BuildNBLArray );\r
                /* Notify NDIS of any and all possible receive buffers. */\r
-               NBL_cnt = __recv_mgr_build_NBL_array(\r
-                       p_port, &done_list, &discarded);\r
+               NBL_cnt = __recv_mgr_build_NBL_array( p_port, &done_list, &discarded);\r
                cl_perf_stop( &p_port->p_adapter->perf, BuildNBLArray );\r
 \r
                /* Only indicate receives if we actually had any. */\r
@@ -2111,36 +2104,35 @@ __recv_cb(
                if (shortage <= 0) {\r
 \r
                        res = shutter_add( &p_port->p_adapter->recv_shutter, NBL_cnt );\r
-                       if (res) {\r
+                       if (res)\r
+                       {\r
                                NdisMIndicateReceiveNetBufferLists(\r
-                                       p_port->p_adapter->h_adapter,\r
-                                       p_port->recv_mgr.recv_NBL_array[0],\r
-                                       NDIS_DEFAULT_PORT_NUMBER,\r
-                                       NBL_cnt,\r
-                                       recv_complete_flags);\r
+                                                                                       p_port->p_adapter->h_adapter,\r
+                                                                                       p_port->recv_mgr.recv_NBL_array[0],\r
+                                                                                       NDIS_DEFAULT_PORT_NUMBER,\r
+                                                                                       NBL_cnt,\r
+                                                                                       recv_complete_flags );\r
                        }\r
                        else {\r
-                               __free_received_NBL (p_port, p_port->recv_mgr.recv_NBL_array[0]);\r
+                               __free_received_NBL( p_port, p_port->recv_mgr.recv_NBL_array[0] );\r
                        }\r
                                \r
                } else {\r
-               \r
-                       // If shortage >0, we already set the status to NDIS_RECEIVE_FLAGS_RESOURCES\r
-                       // That is, IPoIB driver regain ownership of the NET_BUFFER_LIST structures immediately\r
+                       /* If shortage >0, we already set the status to\r
+                          NDIS_RECEIVE_FLAGS_RESOURCES.  That is, IPoIB driver regain\r
+                          ownership of the NET_BUFFER_LIST structures immediately.\r
+                        */\r
                        res = shutter_add( &p_port->p_adapter->recv_shutter, 1 );\r
                        if (res) {\r
                                NdisMIndicateReceiveNetBufferLists(\r
-                                       p_port->p_adapter->h_adapter,\r
-                                       p_port->recv_mgr.recv_NBL_array[0],\r
-                                       NDIS_DEFAULT_PORT_NUMBER,\r
-                                       NBL_cnt,\r
-                                       recv_complete_flags);\r
+                                                                                               p_port->p_adapter->h_adapter,\r
+                                                                                               p_port->recv_mgr.recv_NBL_array[0],\r
+                                                                                               NDIS_DEFAULT_PORT_NUMBER,\r
+                                                                                               NBL_cnt,\r
+                                                                                               recv_complete_flags );\r
                                shutter_sub( &p_port->p_adapter->recv_shutter, -1 );\r
                        }\r
-                       \r
                }\r
-               \r
-       \r
 \r
                cl_perf_stop( &p_port->p_adapter->perf, RecvNdisIndicate );\r
 \r
@@ -2150,15 +2142,16 @@ __recv_cb(
                 */\r
                if( shortage > 0 )\r
                {\r
-\r
                        cl_dbg_out("GOT SHORTAGE <===============\n");\r
                        /* Return all but the last packet to the pool. */\r
                        cl_spinlock_acquire( &p_port->recv_lock );\r
                        //while( shortage-- > 1 )\r
                        while ( NBL_cnt-- > 0)\r
                        {\r
-                               __buf_mgr_put_recv( p_port,\r
-                                       (ipoib_recv_desc_t *)IPOIB_RECV_FROM_NBL( p_port->recv_mgr.recv_NBL_array[NBL_cnt] ),\r
+                               __buf_mgr_put_recv(\r
+                                       p_port,\r
+                                       (ipoib_recv_desc_t *)\r
+                                       IPOIB_RECV_FROM_NBL( p_port->recv_mgr.recv_NBL_array[NBL_cnt] ),\r
                                        p_port->recv_mgr.recv_NBL_array[NBL_cnt] );\r
                        }\r
                        __recv_mgr_repost( p_port );\r
@@ -2182,8 +2175,10 @@ __recv_cb(
                 * __endpt_mgr_insert find a duplicate.\r
                 */\r
                cl_perf_start( RearmRecv );\r
-               status = p_port->p_adapter->p_ifc->rearm_cq(\r
-                       p_port->ib_mgr.h_recv_cq, FALSE );\r
+\r
+               status =\r
+                       p_port->p_adapter->p_ifc->rearm_cq( p_port->ib_mgr.h_recv_cq, FALSE );\r
+\r
                cl_perf_stop( &p_port->p_adapter->perf, RearmRecv );\r
                CL_ASSERT( status == IB_SUCCESS );\r
 \r
@@ -2192,7 +2187,6 @@ __recv_cb(
                // Please note the reference is still up\r
                KeInsertQueueDpc(&p_port->recv_dpc, NULL, NULL);\r
        }\r
-\r
        cl_perf_stop( &p_port->p_adapter->perf, RecvCb );\r
 \r
        IPOIB_EXIT( IPOIB_DBG_RECV );\r
@@ -2494,7 +2488,8 @@ __recv_mgr_filter(
                                        break;\r
                                }\r
                                if ((p_ipoib->type.ip.hdr.ver_hl & 0x0f) != 5 ) {\r
-                                       // If there are IP options in this message, we are in trouble in any case\r
+                                       // If there are IP options in this message, we are in\r
+                                       // trouble in any case\r
                                        status = IB_INVALID_SETTING;\r
                                        break;                                  \r
                                }\r
@@ -2544,8 +2539,7 @@ __recv_mgr_filter(
                else\r
                {\r
                        ip_stat_sel_t               ip_stat;\r
-                       p_desc->len =\r
-                               len + sizeof(eth_hdr_t) - sizeof(ipoib_hdr_t);\r
+                       p_desc->len = len + sizeof(eth_hdr_t) - sizeof(ipoib_hdr_t);\r
                        if( p_dst->h_mcast)\r
                        {\r
                                if( p_dst->dgid.multicast.raw_group_id[10] == 0xFF &&\r
@@ -2810,7 +2804,7 @@ __recv_arp(
        if( p_ib_arp->prot_type != ETH_PROT_TYPE_IP )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("ARP protocal type not IP\n") );\r
+                       ("ARP protocal type not IP?\n") );\r
                return IB_INVALID_SETTING;\r
        }\r
 \r
@@ -2828,8 +2822,7 @@ __recv_arp(
         */\r
        if( *pp_src )\r
        {\r
-               if( cl_memcmp( &(*pp_src)->dgid, &p_ib_arp->src_hw.gid,\r
-                       sizeof(ib_gid_t) ) )\r
+               if( cl_memcmp( &(*pp_src)->dgid, &p_ib_arp->src_hw.gid, sizeof(ib_gid_t) ) )\r
                {\r
                        /*\r
                         * GIDs for the endpoint are different.  The ARP must\r
@@ -2837,14 +2830,14 @@ __recv_arp(
                         */\r
                        *pp_src = NULL;\r
                }\r
-               else if( (*pp_src)->dlid &&\r
-                       (*pp_src)->dlid != p_wc->recv.ud.remote_lid )\r
+               else if( (*pp_src)->dlid && (*pp_src)->dlid != p_wc->recv.ud.remote_lid )\r
                {\r
                        /* Out of date!  Destroy the endpoint and replace it. */\r
                        __endpt_mgr_remove( p_port, *pp_src );\r
                        *pp_src = NULL;\r
                }\r
-               else if ( ! ((*pp_src)->dlid)) {\r
+               else if ( ! ((*pp_src)->dlid))\r
+               {\r
                        /* Out of date!  Destroy the endpoint and replace it. */\r
                        __endpt_mgr_remove( p_port, *pp_src );\r
                        *pp_src = NULL;\r
@@ -2852,7 +2845,7 @@ __recv_arp(
                else if( ipoib_is_voltaire_router_gid( &(*pp_src)->dgid ) )\r
                {\r
                        if( (*pp_src)->qpn != ipoib_addr_get_qpn( &p_ib_arp->src_hw ) &&\r
-                                p_wc->recv.ud.remote_qp !=     ipoib_addr_get_qpn( &p_ib_arp->src_hw ) )\r
+                                p_wc->recv.ud.remote_qp != ipoib_addr_get_qpn( &p_ib_arp->src_hw ) )\r
                        {\r
                                /* Out of date!  Destroy the endpoint and replace it. */\r
                                __endpt_mgr_remove( p_port, *pp_src );\r
@@ -2872,25 +2865,31 @@ __recv_arp(
        {\r
                /* Copy the src GID to allow aligned access */\r
                cl_memcpy( &gid, &p_ib_arp->src_hw.gid, sizeof(ib_gid_t) );\r
-               status = ipoib_mac_from_guid( gid.unicast.interface_id, p_port->p_adapter->params.guid_mask, &mac );\r
+               status = ipoib_mac_from_guid( gid.unicast.interface_id,\r
+                                                                         p_port->p_adapter->params.guid_mask,\r
+                                                                         &mac );\r
                if (status == IB_INVALID_GUID_MASK)\r
                {\r
                        IPOIB_PRINT( TRACE_LEVEL_WARNING, IPOIB_DBG_ERROR,\r
                                ("Invalid GUID mask received, rejecting it") );\r
-                       ipoib_create_log(p_port->p_adapter->h_adapter, GUID_MASK_LOG_INDEX, EVENT_IPOIB_WRONG_PARAMETER_WRN);\r
+                       ipoib_create_log( p_port->p_adapter->h_adapter,\r
+                                                         GUID_MASK_LOG_INDEX,\r
+                                                         EVENT_IPOIB_WRONG_PARAMETER_WRN );\r
+                       return status;\r
                }\r
                else if( status != IB_SUCCESS )\r
                {\r
                        IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
                                ("ipoib_mac_from_guid returned %s\n",\r
-                               p_port->p_adapter->p_ifc->get_err_str( status )) );\r
+                                       p_port->p_adapter->p_ifc->get_err_str( status )) );\r
                        return status;\r
                }\r
+\r
                /*\r
                 * Create the endpoint.\r
                 */\r
                *pp_src = ipoib_endpt_create( &p_ib_arp->src_hw.gid,\r
-                       p_wc->recv.ud.remote_lid, ipoib_addr_get_qpn( &p_ib_arp->src_hw ) );\r
+                                                                         p_wc->recv.ud.remote_lid,                                                                                                                        ipoib_addr_get_qpn( &p_ib_arp->src_hw ) );\r
 \r
                if( !*pp_src )\r
                {\r
@@ -2909,7 +2908,6 @@ __recv_arp(
                                p_port->p_adapter->p_ifc->get_err_str( status )) );\r
                        return status;\r
                }\r
-\r
                cl_obj_unlock( &p_port->obj );\r
        }\r
 \r
@@ -2962,9 +2960,8 @@ __recv_arp(
                if( cl_memcmp( &p_dst->dgid, &p_ib_arp->dst_hw.gid, sizeof(ib_gid_t) ) )\r
                {\r
                        /*\r
-                        * We received bcast ARP packet that means\r
-                        * remote port lets everyone know it was changed IP/MAC\r
-                        * or just activated\r
+                        * We received bcast ARP packet that means the remote port\r
+                        * lets everyone know it was changed IP/MAC or just activated\r
                         */\r
 \r
                        /* Guy: TODO: Check why this check fails in case of Voltaire IPR */\r
@@ -2992,7 +2989,7 @@ __recv_arp(
                        CL_ASSERT( p_dst->qpn == ipoib_addr_get_qpn( &p_ib_arp->dst_hw ) );\r
                }\r
        }\r
-       else /* we got ARP reqeust */\r
+       else /* we got ARP request */\r
        {\r
                cl_memclr( &p_arp->dst_hw, sizeof(mac_addr_t) );\r
                p_arp->dst_ip = p_ib_arp->dst_ip;\r
@@ -3003,6 +3000,7 @@ __recv_arp(
         * we have a chance to create a new endpoint.\r
         */\r
        status = __recv_gen( p_ipoib, p_eth, *pp_src, p_dst );\r
+\r
        if( status != IB_SUCCESS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
@@ -3024,9 +3022,7 @@ __recv_mgr_prepare_NBL(
 {\r
        NDIS_STATUS                                                     status;\r
        uint32_t                                                        pkt_filter;\r
-       //NDIS60\r
        NDIS_TCP_IP_CHECKSUM_NET_BUFFER_LIST_INFO       chksum;\r
-       //NDIS_TCP_IP_CHECKSUM_PACKET_INFO      chksum;\r
 \r
        PERF_DECLARE( GetNdisPkt );\r
 \r
@@ -3046,7 +3042,7 @@ __recv_mgr_prepare_NBL(
                {\r
                        /* OK to report. */\r
                        status = NDIS_STATUS_SUCCESS;\r
-                       IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_ERROR,\r
+                       IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_RECV,\r
                        ("Received UCAST PKT.\n"));\r
                }\r
                else\r
@@ -3069,7 +3065,7 @@ __recv_mgr_prepare_NBL(
                {\r
                        status = NDIS_STATUS_FAILURE;\r
                        IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("Received BCAST PKT with ERROR !!!!\n"));\r
+                       ("Received BCAST PKT with ERROR!!!! pkt_filter 0x%x\n",pkt_filter));\r
                }\r
                break;\r
        case PKT_TYPE_MCAST:\r
@@ -3128,9 +3124,11 @@ __recv_mgr_prepare_NBL(
                (void*)(uintn_t)chksum.Value;\r
                break;\r
          case CSUM_ENABLED:\r
-               /* Get the checksums directly from packet information. */\r
-               /* In this case, no one of cheksum's cat get false value */\r
-               /* If hardware checksum failed or wasn't calculated, NDIS will recalculate it again */\r
+               /* Get the checksums directly from packet information.\r
+                * In this case, no one of cheksum's cat get false value\r
+                * If hardware checksum failed or wasn't calculated, NDIS will recalculate\r
+                * it again\r
+                */\r
                NET_BUFFER_LIST_INFO(*pp_net_buffer_list, TcpIpChecksumNetBufferListInfo) =\r
                        (void*)(uintn_t)(p_desc->ndis_csum.Value);\r
                break;\r
@@ -3152,9 +3150,9 @@ __recv_mgr_prepare_NBL(
 \r
 static uint32_t\r
 __recv_mgr_build_NBL_array(\r
-       IN                              ipoib_port_t* const                     p_port,\r
-               OUT                     cl_qlist_t*                             p_done_list OPTIONAL,\r
-               OUT                     int32_t* const                          p_discarded)\r
+       IN              ipoib_port_t* const             p_port,\r
+       OUT             cl_qlist_t*                     p_done_list OPTIONAL,\r
+       OUT             int32_t* const                  p_discarded )\r
 {\r
        cl_list_item_t                  *p_item;\r
        ipoib_recv_desc_t               *p_desc;\r
@@ -3167,7 +3165,7 @@ __recv_mgr_build_NBL_array(
 \r
        *p_discarded = 0;\r
 \r
-       /* Move any existing receives to the head of p_done_list to preserve ordering. */\r
+       /* to preserve ordering move existing receives to the head of p_done_list */\r
        if ( p_done_list ) {\r
                cl_qlist_insert_list_head( p_done_list, &p_port->recv_mgr.done_list );\r
        } else {\r
@@ -3186,11 +3184,11 @@ __recv_mgr_build_NBL_array(
                {\r
                        CL_ASSERT( p_port->recv_mgr.recv_NBL_array[i] );\r
 \r
-                       if (i) {\r
-                               // Link NBLs together\r
+                       if (i)\r
+                       {       // Link NBLs together\r
                                NET_BUFFER_LIST_NEXT_NBL(p_port->recv_mgr.recv_NBL_array[i-1]) = \r
                                        p_port->recv_mgr.recv_NBL_array[i];\r
-                               }\r
+                       }\r
                        i++;\r
                }\r
                else if( status == IB_NOT_DONE )\r
@@ -3270,6 +3268,7 @@ __send_mgr_init(
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
                        ("cl_qpool_init for sends returned %#x\n",\r
                        cl_status) );\r
+               IPOIB_EXIT(IPOIB_DBG_SEND );\r
                return  IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
@@ -3287,15 +3286,15 @@ __send_mgr_init(
                NdisWriteErrorLogEntry( p_port->p_adapter->h_adapter,\r
                        EVENT_IPOIB_RECV_POOL, 1, cl_status ); //TODO EVENT_IPOIB_SEND_POOL\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("cl_qpool_init for sends returned %#x\n",\r
-                       cl_status) );\r
+                       ("cl_qpool_init for sends returned %#x\n", cl_status) );\r
                cl_qpool_destroy(&p_port->send_mgr.sg_pool);\r
                return IB_INSUFFICIENT_MEMORY;\r
        }\r
 \r
-       //This send descriptor can't be allocated on the stack because of boundary violation !!!\r
-       p_port->p_desc =  \r
-                       (ipoib_send_desc_t *)ExAllocatePoolWithTag(NonPagedPool ,sizeof (ipoib_send_desc_t), 'XMXA');\r
+       //This send descriptor can't be allocated on the stack because of boundary\r
+       // violation !!!\r
+       p_port->p_desc = (ipoib_send_desc_t *)\r
+               ExAllocatePoolWithTag(NonPagedPool ,sizeof (ipoib_send_desc_t), 'XMXA');\r
        if (!p_port->p_desc) {\r
                NdisWriteErrorLogEntry( p_port->p_adapter->h_adapter,\r
                        EVENT_IPOIB_RECV_POOL, 1, CL_INSUFFICIENT_MEMORY); //TODO EVENT_IPOIB_SEND_POOL\r
@@ -3363,7 +3362,7 @@ __send_mgr_filter(
        IN              const   eth_hdr_t* const                        p_eth_hdr,\r
        IN                              MDL* const                                      p_mdl,\r
        IN                              size_t                                          buf_len,\r
-       IN      OUT                     ipoib_send_NB_SG                        *s_buf)\r
+       IN      OUT                     ipoib_send_NB_SG                        *s_buf )\r
 {\r
        NDIS_STATUS             status;\r
 \r
@@ -3575,8 +3574,7 @@ __send_mgr_get_eth_hdr(
        if( *p_mdl_len < sizeof(eth_hdr_t) )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                       ("First buffer in packet smaller than eth_hdr_t: %d.\n",\r
-                       *p_mdl_len) );\r
+                       ("First buffer in packet smaller than eth_hdr_t: %d.\n", *p_mdl_len) );\r
                return NDIS_STATUS_BUFFER_TOO_SHORT;\r
        }\r
 \r
@@ -3600,6 +3598,7 @@ __send_mgr_get_eth_hdr(
 \r
 \r
 #if !IPOIB_USE_DMA\r
+\r
 /* Send using the MDL's page information rather than the SGL. */\r
 static ib_api_status_t\r
 __send_gen(\r
@@ -3743,7 +3742,6 @@ __send_gen(
 \r
 ULONG g_ipoib_send_mcast = 0;\r
 \r
-\r
 // returns true if buffer was sent\r
 \r
 bool \r
@@ -3752,7 +3750,7 @@ ipoib_process_sg_list_real(
     IN  PVOID                   pIrp,\r
     IN  PSCATTER_GATHER_LIST    p_sgl,\r
     IN  PVOID                   context )\r
-{      \r
+{\r
        NDIS_STATUS                             status;\r
        ipoib_port_t                    *p_port;\r
        MDL                                             *p_mdl;\r
@@ -3766,6 +3764,8 @@ ipoib_process_sg_list_real(
        boolean_t                               from_queue;\r
        ib_api_status_t                 ib_status;\r
        ULONG                                   complete_flags = 0;\r
+       ipoib_send_NB_SG                *s_buf;\r
+       ipoib_send_desc_t               *p_desc;\r
 \r
        IPOIB_ENTER( IPOIB_DBG_SEND );\r
 \r
@@ -3786,18 +3786,21 @@ ipoib_process_sg_list_real(
        ++g_ipoib_send_SG_real;\r
 \r
        //Read Data from the buffer passed as a context\r
-       ipoib_send_NB_SG *  s_buf = (ipoib_send_NB_SG *)context;\r
+       s_buf =                         (ipoib_send_NB_SG *)context;\r
        p_net_buffer_list = s_buf->p_nbl;\r
        p_netbuf =                      s_buf->p_curr_nb;\r
        p_port =                        s_buf->p_port;\r
+       p_desc =                        p_port->p_desc;\r
 \r
-\r
-       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_SEND,\r
-                               ("Processing netbuffer list: %p \n", p_net_buffer_list) );\r
+       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_BUF,\r
+               ("Processing netbuffer list %p s_buf %p\n", p_net_buffer_list, s_buf) );\r
 \r
        //TODO Define this function as void if we are not in DBG mode\r
        //cl_qlist_check_validity(&p_port->send_mgr.pending_list);\r
-       NDIS_SET_SEND_COMPLETE_FLAG(complete_flags, NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL);\r
+\r
+       NDIS_SET_SEND_COMPLETE_FLAG(complete_flags,\r
+                                                               NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL);\r
+\r
        CL_ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);\r
        \r
        p_port->p_desc->p_netbuf_list = p_net_buffer_list;\r
@@ -3827,13 +3830,19 @@ ipoib_process_sg_list_real(
                ret = true;\r
                goto send_end;\r
        }\r
+\r
        from_queue = (boolean_t)(s_buf->p_sgl != NULL);\r
 \r
        if (from_queue)\r
        {\r
                cl_perf_start( GetEndpt );\r
-               status = __endpt_mgr_ref( p_port, p_eth_hdr->dst, &(p_port->p_desc->p_endpt) );\r
-               IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,("__endpt_mgr_ref called for %p\n", p_port->p_desc->p_endpt));\r
+               status = __endpt_mgr_ref( p_port,\r
+                                                                 p_eth_hdr->dst,\r
+                                                                 &(p_port->p_desc->p_endpt) );\r
+\r
+               IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,\r
+                               ("__endpt_mgr_ref called on EP %p\n", p_port->p_desc->p_endpt));\r
+\r
                cl_perf_stop( &p_port->p_adapter->perf, GetEndpt );\r
                if( status == NDIS_STATUS_PENDING )\r
                {\r
@@ -3852,33 +3861,43 @@ ipoib_process_sg_list_real(
 \r
                        if( ETH_IS_MULTICAST( p_eth_hdr->dst.addr ) )\r
                        {\r
-                               IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST, ("recived a mc packet (from the queue) %p\n", p_net_buffer_list));\r
+                               IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,\r
+                                       ("recived a mc packet (from the queue) %p\n",\r
+                                               p_net_buffer_list));\r
                                if( ipoib_port_join_mcast( p_port, p_eth_hdr->dst,\r
                                        IB_MC_REC_STATE_FULL_MEMBER) == IB_SUCCESS )\r
                                {\r
                                        s_buf->p_sgl = p_sgl;\r
-                                       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,("We insert this MULTICAST item back to the pending list: %p \n", p_net_buffer_list));                                    \r
-                                       cl_qlist_insert_head( &p_port->send_mgr.pending_list, (cl_list_item_t*) s_buf  );\r
+                                       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,\r
+                                               ("Insert MULTICAST item back to the pending list %p\n",\r
+                                                       p_net_buffer_list));                                    \r
+                                       cl_qlist_insert_head( &p_port->send_mgr.pending_list,\r
+                                                                                 (cl_list_item_t*) s_buf );\r
                                        ret = false;\r
                                        ++g_ipoib_send_SG_pending;\r
                                        goto send_end;\r
                                }\r
                        }\r
+\r
                        /*\r
                         * Complete the send as if we sent it - WHQL tests don't like the\r
                         * sends to fail.\r
                         */\r
-                       IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,("We got bad status and the packet had not been sent\n"));\r
+                       IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
+                                       ("Bad status: packet has not been sent\n"));\r
                        cl_perf_start( ProcessFailedSends );\r
 \r
-                       __send_complete_net_buffer(s_buf, NDIS_STATUS_SUCCESS, complete_flags, TRUE);\r
+                       __send_complete_net_buffer(     s_buf,\r
+                                                                               NDIS_STATUS_SUCCESS,\r
+                                                                               complete_flags,\r
+                                                                               TRUE );\r
                        ret = true;\r
                        goto send_end;\r
                }\r
        }\r
        else //We got this Net Buffer and its SG list directly from NDIS\r
        {\r
-               ASSERT(s_buf->p_sgl ==NULL);\r
+               ASSERT(s_buf->p_sgl == NULL);\r
                s_buf->p_sgl = p_sgl;\r
                \r
                cl_perf_start( SendMgrQueue );\r
@@ -3886,17 +3905,14 @@ ipoib_process_sg_list_real(
                         p_eth_hdr->type == ETH_PROT_TYPE_IP &&\r
                         !ETH_IS_BROADCAST( p_eth_hdr->dst.addr ) ) \r
                {\r
-\r
-                       IPOIB_PRINT_EXIT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,\r
-                               ("recived a Multicast NBL= %p\n", p_net_buffer_list) );\r
-\r
-                       \r
-               \r
                        ip_hdr_t                        *p_ip_hdr;\r
                        uint8_t                         *p_tmp;\r
                        MDL                                     *p_ip_hdr_mdl;\r
                        UINT                            ip_hdr_mdl_len;\r
                        \r
+                       IPOIB_PRINT_EXIT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,\r
+                               ("Sent a Multicast NBL=%p\n", p_net_buffer_list) );\r
+               \r
                        g_ipoib_send_mcast++;\r
                        \r
                        if(mdl_len >= sizeof(ip_hdr_t) + sizeof(eth_hdr_t))\r
@@ -3930,7 +3946,6 @@ ipoib_process_sg_list_real(
                                p_ip_hdr = (ip_hdr_t*)(p_tmp + NET_BUFFER_CURRENT_MDL_OFFSET(p_netbuf));\r
                                \r
                        }\r
-                       \r
                        p_eth_hdr->dst.addr[1] = ((unsigned char*)&p_ip_hdr->dst_ip)[0] & 0x0f;\r
                        p_eth_hdr->dst.addr[3] = ((unsigned char*)&p_ip_hdr->dst_ip)[1];\r
 \r
@@ -3939,9 +3954,7 @@ ipoib_process_sg_list_real(
 mc_end:\r
                ASSERT(s_buf->p_sgl);\r
 \r
-               status = __send_mgr_queue( p_port,\r
-                                                                  p_eth_hdr,\r
-                                                                  &(p_port->p_desc->p_endpt) );\r
+               status = __send_mgr_queue( p_port, p_eth_hdr, &(p_port->p_desc->p_endpt) );\r
 \r
                cl_perf_stop( &p_port->p_adapter->perf, SendMgrQueue );\r
                if( status == NDIS_STATUS_PENDING )\r
@@ -3967,8 +3980,10 @@ mc_end:
                         */\r
                         //TODO - check previous comment !\r
                        cl_perf_start( ProcessFailedSends );\r
-                       __send_complete_net_buffer( s_buf, NDIS_STATUS_SUCCESS,\r
-                                                                               complete_flags, TRUE);\r
+                       __send_complete_net_buffer( s_buf,\r
+                                                                               NDIS_STATUS_SUCCESS,\r
+                                                                               complete_flags,\r
+                                                                               TRUE );\r
                        cl_perf_stop( &p_port->p_adapter->perf, ProcessFailedSends );\r
                        ret = true;\r
                        goto send_end;\r
@@ -4023,6 +4038,8 @@ send_end:
 }\r
 \r
 \r
+// This routine called during execution of NdisMAllocateNetBufferSGList().\r
+\r
 void \r
 ipoib_process_sg_list(\r
     IN  PDEVICE_OBJECT          pDO,\r
@@ -4040,7 +4057,7 @@ ipoib_process_sg_list(
                //ASSERT(g_ipoib_send_SG-2 <= g_ipoib_send + g_ipoib_send_mcast+p_port->send_mgr.pending_list.count+ g_ipoib_send_SG_failed);\r
        }\r
 \r
-       ipoib_process_sg_list_real(pDO, pIrp, p_sgl, context);\r
+       ipoib_process_sg_list_real( pDO, pIrp, p_sgl, context );\r
 \r
        if (g_ipoib_send_SG > 1) {\r
                //ASSERT(g_ipoib_send_SG-1 <= g_ipoib_send + g_ipoib_send_mcast+p_port->send_mgr.pending_list.count + g_ipoib_send_SG_failed);\r
@@ -4074,25 +4091,29 @@ __send_gen(
                return NDIS_STATUS_FAILURE;\r
        }\r
        ipoib_send_desc_t *p_desc = s_buf->p_port->p_desc;\r
-       //TODO: Copy only essential data\r
-       // That is, copy only 2 chunks of ETH header if it contained in several first SG elements\r
-       // Copy only N+1-MAX_SEND_SGE, where N is a lenght of SG List\r
-       /* Remember that one of the DS entries is reserved for the IPoIB header. */\r
+\r
+       /* TODO: Copy only essential data\r
+          That is, copy only 2 chunks of ETH header if it contained in several\r
+          first SG elements.\r
+          Copy only N+1-MAX_SEND_SGE, where N is a lenght of SG List\r
+          Remember that one of the DS entries is reserved for the IPoIB header.\r
+       */\r
        if( ( p_sgl->NumberOfElements >= MAX_SEND_SGE ||\r
                p_sgl->Elements[0].Length < sizeof(eth_hdr_t)) )\r
        {\r
-\r
                IPOIB_PRINT( TRACE_LEVEL_WARNING, IPOIB_DBG_SEND,\r
                        ("Too many buffers %d to fit in WR ds_array[%d] \\r
                         Or buffer[0] length %d < Eth header. Copying data.\n",\r
-                       p_sgl->NumberOfElements, MAX_SEND_SGE,  p_sgl->Elements[0].Length ) );\r
-               status = NDIS_STATUS_RESOURCES;\r
+                       p_sgl->NumberOfElements, MAX_SEND_SGE, p_sgl->Elements[0].Length ) );\r
+\r
                if( !s_buf->p_port->p_adapter->params.cm_enabled )\r
                {\r
                        cl_perf_start( SendCopy );\r
                        status = __send_copy( s_buf->p_port, s_buf, lso_header_size );\r
                        cl_perf_stop( &s_buf->p_port->p_adapter->perf, SendCopy );\r
                }\r
+\r
+               status = NDIS_STATUS_RESOURCES;\r
                IPOIB_EXIT( IPOIB_DBG_SEND );\r
                return status;\r
        }\r
@@ -4206,6 +4227,7 @@ __send_mgr_filter_ip(
        {\r
                p_ip_hdr = (ip_hdr_t*)(p_eth_hdr + 1);\r
        }\r
+\r
        if( buf_len < sizeof(ip_hdr_t) )\r
        {\r
                /* This buffer is done for.  Get the next buffer. */\r
@@ -4217,9 +4239,9 @@ __send_mgr_filter_ip(
        switch( p_ip_hdr->prot )\r
        {\r
        case IP_PROT_UDP:\r
-\r
                cl_perf_start( FilterUdp );\r
-               status = __send_mgr_filter_udp( p_ip_hdr, p_mdl, (buf_len - sizeof(ip_hdr_t)), s_buf );\r
+               status = __send_mgr_filter_udp( p_ip_hdr, p_mdl,\r
+                                                                               (buf_len - sizeof(ip_hdr_t)), s_buf );\r
                cl_perf_stop( &p_port->p_adapter->perf, FilterUdp );\r
                if( status == NDIS_STATUS_PENDING )\r
                {  /* not DHCP packet, keep going */\r
@@ -4239,19 +4261,22 @@ __send_mgr_filter_ip(
                In igmp packet I saw that iph arrive in 2 NDIS_BUFFERs:\r
                1. iph\r
                2. ip options\r
-                               So to get the IGMP packet we need to skip the ip options NDIS_BUFFER\r
-                       */\r
+                       So to get the IGMP packet we need to skip the ip options NDIS_BUFFER\r
+               */\r
                        iph_size_in_bytes = (p_ip_hdr->ver_hl & 0xf) * 4;\r
                        iph_options_size = iph_size_in_bytes - buf_len;\r
                        buf_len -= sizeof(ip_hdr_t);//without ipheader\r
 \r
-                       /*\r
+               /*\r
                Could be a case that arrived igmp packet not from type IGMPv2 ,\r
                but IGMPv1 or IGMPv3.\r
                We anyway pass it to __send_mgr_filter_igmp_v2().\r
                */\r
-               status =\r
-                       __send_mgr_filter_igmp_v2( s_buf->p_port, p_ip_hdr, iph_options_size, p_mdl, buf_len );\r
+               status = __send_mgr_filter_igmp_v2( s_buf->p_port,\r
+                                                                                       p_ip_hdr,\r
+                                                                                       iph_options_size,\r
+                                                                                       p_mdl,\r
+                                                                                       buf_len );\r
                if( status != NDIS_STATUS_SUCCESS )\r
                        return status;\r
 \r
@@ -4277,10 +4302,17 @@ __send_mgr_filter_ip(
                {\r
                        //TODO: NDIS60\r
                        #if 0\r
-                       status = __send_fragments( p_port, p_desc, (eth_hdr_t* const)p_eth_hdr,\r
-                                               (ip_hdr_t* const)p_ip_hdr, (uint32_t)buf_len, p_mdl );\r
+                       status = __send_fragments( p_port,\r
+                                                                          p_desc,\r
+                                                                          (eth_hdr_t* const)p_eth_hdr,\r
+                                                                          (ip_hdr_t* const)p_ip_hdr,\r
+                                                                          (uint32_t)buf_len,\r
+                                                                          p_mdl );\r
                        return status;\r
                        #endif\r
+                       IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
+                               ("TODO NDIS6 SEND_UD_QP fragments @ line #%d file %s\n",\r
+                                       __LINE__,__FILE__) );\r
                        ASSERT(FALSE);\r
                }\r
        }\r
@@ -4310,11 +4342,13 @@ __send_mgr_filter_igmp_v2(
        IPOIB_ENTER( IPOIB_DBG_SEND );\r
 \r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,\r
-                        ("buf_len = %d,iph_options_size = %d\n",(int)buf_len,(int)iph_options_size ) );\r
+               ("buf_len = %d,iph_options_size = %d\n",\r
+                       (int)buf_len, (int)iph_options_size) );\r
 \r
        if( !buf_len )\r
        {\r
-               // To get the IGMP packet we need to skip the ip options NDIS_BUFFER (if exists)\r
+               // To get the IGMP packet we need to skip the ip options NDIS_BUFFER\r
+               // (if exists)\r
                while ( iph_options_size )\r
                {\r
                        NdisGetNextMdl( p_mdl, &p_mdl );\r
@@ -4379,9 +4413,10 @@ __send_mgr_filter_igmp_v2(
                        collector will not delete this mcast endpt.\r
                */\r
                IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,\r
-                       ("Catched IGMP_V2_MEMBERSHIP_REPORT message\n") );\r
+                       ("Received IGMP_V2_MEMBERSHIP_REPORT message\n") );\r
                endpt_status = __endpt_mgr_ref( p_port, fake_mcast_mac, &p_endpt );\r
-               IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,("__endpt_mgr_ref called for %p\n", p_endpt));\r
+               IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,\r
+                               ("__endpt_mgr_ref called for %p\n", p_endpt));\r
                if ( p_endpt )\r
                {\r
                        cl_obj_lock( &p_port->obj );\r
@@ -4398,9 +4433,10 @@ __send_mgr_filter_igmp_v2(
                        garbage collector will delete this mcast endpt next time.\r
                */\r
                IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,\r
-                            ("Catched IGMP_V2_LEAVE_GROUP message\n") );\r
+                            ("Received IGMP_V2_LEAVE_GROUP message\n") );\r
                endpt_status = __endpt_mgr_ref( p_port, fake_mcast_mac, &p_endpt );\r
-               IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,("__endpt_mgr_ref called for %p\n", p_endpt));\r
+               IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,\r
+                       ("__endpt_mgr_ref called for %p\n", p_endpt));\r
                if ( p_endpt )\r
                {\r
                        cl_obj_lock( &p_port->obj );\r
@@ -4698,7 +4734,9 @@ __send_mgr_filter_dhcp(
        /* no chksum for udp */\r
        s_buf->p_send_buf->ip.prot.udp.hdr.chksum = 0;\r
        p_desc->send_wr[0].local_ds[1].vaddr = cl_get_physaddr( s_buf->p_send_buf );\r
-       p_desc->send_wr[0].local_ds[1].length = sizeof(ip_hdr_t) +      sizeof(udp_hdr_t) + sizeof(dhcp_pkt_t);\r
+       p_desc->send_wr[0].local_ds[1].length = sizeof(ip_hdr_t)\r
+                                                                                       + sizeof(udp_hdr_t)\r
+                                                                                       + sizeof(dhcp_pkt_t);\r
        p_desc->send_wr[0].local_ds[1].lkey = s_buf->p_port->ib_mgr.lkey;\r
        p_desc->send_wr[0].wr.num_ds = 2;\r
        p_desc->send_dir = SEND_UD_QP;\r
@@ -4741,9 +4779,7 @@ __send_mgr_filter_arp(
                }\r
        }\r
        else\r
-       {\r
                p_arp = (arp_pkt_t*)(p_eth_hdr + 1);\r
-       }\r
 \r
        /* Single buffer ARP packet. */\r
        if( buf_len < sizeof(arp_pkt_t) )\r
@@ -4763,7 +4799,8 @@ __send_mgr_filter_arp(
        /* Allocate our scratch buffer. */\r
        ASSERT(s_buf->p_send_buf == NULL);\r
        s_buf->p_send_buf = (send_buf_t*)\r
-               NdisAllocateFromNPagedLookasideList( &s_buf->p_port->buf_mgr.send_buf_list );\r
+                                                       NdisAllocateFromNPagedLookasideList(\r
+                                                                               &s_buf->p_port->buf_mgr.send_buf_list );\r
        if( !s_buf->p_send_buf )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
@@ -4789,14 +4826,18 @@ __send_mgr_filter_arp(
 #endif\r
 \r
        ib_gid_set_default( &p_ib_arp->src_hw.gid,\r
-               s_buf->p_port->p_adapter->guids.port_guid.guid );\r
+                                               s_buf->p_port->p_adapter->guids.port_guid.guid );\r
+\r
        p_ib_arp->src_ip = p_arp->src_ip;\r
+\r
        if( cl_memcmp( &p_arp->dst_hw, &null_hw, sizeof(mac_addr_t) ) )\r
        {\r
                /* Get the endpoint referenced by the dst_hw address. */\r
                net32_t qpn = 0;\r
-               status = __endpt_mgr_get_gid_qpn( s_buf->p_port, p_arp->dst_hw,\r
-                       &p_ib_arp->dst_hw.gid, &qpn );\r
+               status = __endpt_mgr_get_gid_qpn( s_buf->p_port,\r
+                                                                                 p_arp->dst_hw,\r
+                                                                                 &p_ib_arp->dst_hw.gid,\r
+                                                                                 &qpn );\r
                if( status != NDIS_STATUS_SUCCESS )\r
                {\r
                        IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
@@ -4838,11 +4879,12 @@ __send_mgr_filter_arp(
                        \r
                        case IPOIB_CM_CONNECT:\r
                                /* queue ARP REP packet until connected */\r
-                                       NdisFreeToNPagedLookasideList(\r
+                               NdisFreeToNPagedLookasideList(\r
                                        &p_port->buf_mgr.send_buf_list, s_buf->p_send_buf );\r
-                                       cl_qlist_insert_tail( &p_port->send_mgr.pending_list,\r
-                                                               IPOIB_LIST_ITEM_FROM_NBL( p_desc->p_pkt ) );\r
-                                       return NDIS_STATUS_PENDING;\r
+                               cl_qlist_insert_tail( &p_port->send_mgr.pending_list,\r
+                                                                               IPOIB_LIST_ITEM_FROM_NBL( s_buf->p_nbl ) );\r
+\r
+                               return NDIS_STATUS_PENDING;\r
                        default:\r
                                break;\r
                        }\r
@@ -4898,7 +4940,7 @@ __send_mgr_queue(
        if( cl_qlist_count( &p_port->send_mgr.pending_list ) )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_WARNING, IPOIB_DBG_SEND,\r
-                       ("Pending list not empty.\n") );\r
+                       ("Pending list not empty p_eth_hdr %p\n",p_eth_hdr) );\r
                return NDIS_STATUS_PENDING;\r
        }\r
 \r
@@ -4919,7 +4961,8 @@ __send_mgr_queue(
        if( status == NDIS_STATUS_NO_ROUTE_TO_DESTINATION &&\r
                ETH_IS_MULTICAST( p_eth_hdr->dst.addr ) )\r
        {\r
-               IPOIB_PRINT_EXIT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,("Calling join mcast from send_mgr_queue\n"));\r
+               IPOIB_PRINT_EXIT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,\r
+                               ("Calling join mcast from send_mgr_queue\n"));\r
                if( ipoib_port_join_mcast( p_port, p_eth_hdr->dst, \r
                        IB_MC_REC_STATE_FULL_MEMBER) == IB_SUCCESS )\r
                {\r
@@ -4998,14 +5041,17 @@ __build_send_desc(
        hdr_idx = cl_atomic_inc( &s_buf->p_port->hdr_idx );\r
        hdr_idx &= (s_buf->p_port->p_adapter->params.sq_depth - 1);\r
        ASSERT( hdr_idx < s_buf->p_port->p_adapter->params.sq_depth );\r
+\r
        s_buf->p_port->hdr[hdr_idx].type = p_eth_hdr->type;\r
        s_buf->p_port->hdr[hdr_idx].resv = 0;\r
 \r
-       //TODO why we enter this block for LSO ???\r
-       p_desc->send_wr[0].local_ds[0].vaddr = cl_get_physaddr( &s_buf->p_port->hdr[hdr_idx] );\r
+       //TODO why enter this block for LSO ???\r
+       p_desc->send_wr[0].local_ds[0].vaddr =\r
+                                                               cl_get_physaddr( &s_buf->p_port->hdr[hdr_idx] );\r
        p_desc->send_wr[0].local_ds[0].length = sizeof(ipoib_hdr_t);\r
        p_desc->send_wr[0].local_ds[0].lkey = s_buf->p_port->ib_mgr.lkey;\r
        p_desc->send_wr[0].wr.send_opt = 0;\r
+\r
        //Init send buffer to 0\r
        s_buf->p_send_buf = NULL;\r
 \r
@@ -5015,7 +5061,12 @@ __build_send_desc(
                \r
                ASSERT( mss == (p_lso_info->LsoV1Transmit.MSS & p_lso_info->LsoV2Transmit.MSS));\r
                //ASSERT ( (mss & (1<<20)) == mss);\r
-               status = __build_lso_desc( s_buf->p_port, mss, hdr_idx, p_lso_info, s_buf->p_curr_nb);\r
+               status = __build_lso_desc( s_buf->p_port,\r
+                                                                  mss,\r
+                                                                  hdr_idx,\r
+                                                                  p_lso_info,\r
+                                                                  s_buf->p_curr_nb );\r
+\r
                if( status != NDIS_STATUS_SUCCESS )\r
                {\r
                        IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
@@ -5071,6 +5122,7 @@ __build_send_desc(
                        CL_ASSERT( p_desc->send_dir == SEND_RC_QP );\r
                        p_desc->send_qp = p_desc->p_endpt->conn.h_work_qp;\r
                }\r
+\r
                for( i = 0; i < p_desc->num_wrs; i++ )\r
                {\r
                        p_desc->send_wr[i].wr.wr_type = WR_SEND;\r
@@ -5091,6 +5143,7 @@ __build_send_desc(
        return NDIS_STATUS_SUCCESS;\r
 }\r
 \r
+\r
 static NDIS_STATUS\r
 __build_lso_desc(\r
        IN                              ipoib_port_t* const                     p_port,\r
@@ -5188,11 +5241,8 @@ CreateFragList(
     ULONG PhysBufCount,\r
     PNET_BUFFER NetBuff,\r
     ULONG PacketLength,\r
-    PMP_FRAG_LIST pFragList\r
-    )\r
+    PMP_FRAG_LIST pFragList )\r
 {\r
-\r
-\r
     ULONG i = 0;\r
        int j=0;\r
 \r
@@ -5202,7 +5252,6 @@ CreateFragList(
     ULONG CurrentMdlDataOffset = NET_BUFFER_CURRENT_MDL_OFFSET(NetBuff);\r
     ASSERT(MmGetMdlByteCount(pMdl) >= CurrentMdlDataOffset);\r
 \r
-    \r
     ASSERT(NetBuff != NULL);\r
 #ifdef DBG\r
     ASSERT(PhysBufCount <= MAX_PHYS_BUF_FRAG_ELEMENTS);\r
@@ -5214,7 +5263,8 @@ CreateFragList(
     UNREFERENCED_PARAMETER(PacketLength);\r
 \r
 \r
-    IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND, ("CreateFragList: NetBuff %p, Length =0x%x\n", NetBuff, buf_len));\r
+    IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND,\r
+               ("CreateFragList: NetBuff %p, Length =0x%x\n", NetBuff, buf_len));\r
 \r
     while ( (pMdl != NULL) && (buf_len != 0) )\r
     {\r
@@ -5233,7 +5283,9 @@ CreateFragList(
 \r
         ASSERT( (buf_len > 0) && (MdlBytesCount > 0) );\r
  \r
-               IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND, ("CreateFragList: pMdl=%p, MdlBytesCount=x%x, MdlBufCount=0x%x\n", pMdl, MdlBytesCount, MdlBufCount));\r
+               IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND,\r
+                       ("CreateFragList: pMdl=%p, MdlBytesCount=x%x, MdlBufCount=0x%x\n",\r
+                               pMdl, MdlBytesCount, MdlBufCount));\r
 \r
         if (MdlBytesCount > 0)\r
         {\r
@@ -5247,22 +5299,21 @@ CreateFragList(
                 buf_len = 0;                \r
             }                        \r
             //\r
-            // In some cases the mdlcount is greater than needed and in the last page\r
-            // there is 0 bytes\r
+            // In some cases the mdlcount is greater than needed and in the last\r
+                       // page there is 0 bytes\r
             //\r
             for (j=0; ((j< MdlBufCount) && (MdlBytesCount > 0)); j++) \r
             {\r
                 ASSERT(MdlBytesCount > 0);\r
                 if (j ==0 ) \r
                 {\r
-                    //\r
                     // First page\r
                     //\r
                     ULONG64 ul64PageNum = page_array[j];\r
-                    pFragList->Elements[i].Address.QuadPart = (ul64PageNum << PAGE_SHIFT)+ offset;\r
+                    pFragList->Elements[i].Address.QuadPart =\r
+                                                                                       (ul64PageNum << PAGE_SHIFT)+ offset;\r
                     if( offset + MdlBytesCount > PAGE_SIZE )\r
                     {\r
-                        //\r
                         // the data slides behind the page boundry\r
                         //\r
                         ASSERT(PAGE_SIZE > offset);\r
@@ -5271,14 +5322,16 @@ CreateFragList(
                     }\r
                     else\r
                     {\r
-                        //\r
                         // All the data is hold in one page\r
                         //    \r
                         pFragList->Elements[i].Length = MdlBytesCount;\r
                         MdlBytesCount = 0;\r
                     }\r
 \r
-                   IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND, ( "CreateFragList: j == 0, MdlBytesCount=x%x, i = %d, element.length=0x%x \n",  MdlBytesCount, i, pFragList->Elements[i].Length));                    \r
+                   IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND,\r
+                                               ("CreateFragList: j == 0, MdlBytesCount=x%x, i = %d, "\r
+                                               "element.length=0x%x \n",\r
+                                                       MdlBytesCount, i, pFragList->Elements[i].Length));\r
                 } \r
                 else \r
                 {\r
@@ -5292,8 +5345,8 @@ CreateFragList(
                     }\r
                     else \r
                     {\r
-                        //\r
-                        // Not first page. so the data always start at the begining of the page\r
+                        // Not first page. so the data always start at the\r
+                                               // begining of the page\r
                         //\r
                         ULONG64 ul64PageNum = page_array[j];\r
                         pFragList->Elements[i].Address.QuadPart = (ul64PageNum << PAGE_SHIFT);\r
@@ -5301,49 +5354,51 @@ CreateFragList(
                         MdlBytesCount -= pFragList->Elements[i].Length;\r
                     }\r
 \r
-                    IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND, ( "CreateFragList: j != 0, MdlBytesCount=x%x, i = %d, element.length=0x%x \n",  MdlBytesCount, i, pFragList->Elements[i].Length));                    \r
+                    IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND,\r
+                                               ( "CreateFragList: j != 0, MdlBytesCount=x%x, i = %d, "\r
+                                               "element.length=0x%x \n",\r
+                                                       MdlBytesCount, i, pFragList->Elements[i].Length));\r
                 }                \r
                 i++;\r
                 ASSERT(i <= MAX_PHYS_BUF_FRAG_ELEMENTS);\r
             }\r
         }\r
-\r
         pMdl = pMdl->Next;\r
     }\r
         \r
     if (buf_len != 0)\r
     {\r
-        //\r
-        // In some cases the size in MDL isn't equal to the buffer size. In such \r
-        // a case we need to add the rest of packet to last chunk\r
+        // In some cases the size in MDL isn't equal to the buffer size.\r
+               // In such a case we need to add the rest of packet to last chunk\r
         //\r
         ASSERT(i > 0); // To prevent array underflow\r
         pFragList->Elements[i-1].Length += buf_len;\r
-        IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND, ( "CreateFragList: buf_len != 0, i = %d, element.length=0x%x \n",  i -1, pFragList->Elements[i-1].Length));                    \r
+        IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND,\r
+                       ( "CreateFragList: buf_len != 0, i = %d, element.length=0x%x \n",\r
+                               i-1, pFragList->Elements[i-1].Length));\r
     }\r
 \r
     ASSERT(i <= PhysBufCount);\r
     pFragList->NumberOfElements = i;\r
 \r
 #ifdef DBG\r
-{\r
-    ULONG size = 0;\r
-    for (i  = 0; i <  pFragList->NumberOfElements; ++i)\r
-    {\r
-        size += pFragList->Elements[i].Length;\r
-    }\r
-    ASSERT(size == PacketLength);\r
-}\r
+       {\r
+       ULONG size = 0;\r
+       for (i  = 0; i <  pFragList->NumberOfElements; ++i)\r
+       {\r
+               size += pFragList->Elements[i].Length;\r
+       }\r
+       ASSERT(size == PacketLength);\r
+       }\r
 #endif\r
-\r
 }\r
 \r
 \r
 void\r
 ipoib_port_send(\r
-       IN                              ipoib_port_t* const                     p_port,\r
-    IN  NET_BUFFER_LIST     *p_net_buffer_list,\r
-    IN  ULONG               send_flags)\r
+       IN      ipoib_port_t* const             p_port,\r
+    IN  NET_BUFFER_LIST        *p_net_buffer_list,\r
+    IN  ULONG                  send_flags )\r
 {\r
        NDIS_STATUS                     status;\r
        PNET_BUFFER                     p_netbuf, p_next_netbuf = NULL;\r
@@ -5370,23 +5425,21 @@ ipoib_port_send(
                NDIS_RAISE_IRQL_TO_DISPATCH(&old_irql);\r
                //ASSERT (KeGetCurrentIrql() == PASSIVE_LEVEL); // Happens\r
        }\r
-       NDIS_SET_SEND_COMPLETE_FLAG(send_complete_flags, NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL);\r
-       \r
+       NDIS_SET_SEND_COMPLETE_FLAG( send_complete_flags,\r
+                                                                NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL );\r
        cl_obj_lock( &p_port->obj );\r
        if( p_port->state != IB_QPS_RTS )\r
        {\r
                cl_obj_unlock( &p_port->obj );\r
                \r
                IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND,\r
-                       ("QP state isnt RTS, exiting from port_send\n"));\r
+                       ("Invalid QP state: not RTS, exiting from port_send\n"));\r
                NET_BUFFER_LIST_STATUS(p_net_buffer_list) = NDIS_STATUS_FAILURE;\r
                ipoib_inc_send_stat( p_port->p_adapter, IP_STAT_DROPPED, 0 );\r
                        \r
-               NdisMSendNetBufferListsCompleteX(\r
-                       p_port->p_adapter,\r
-                       p_net_buffer_list,\r
-                       send_complete_flags);  \r
-               \r
+               NdisMSendNetBufferListsCompleteX( p_port->p_adapter,\r
+                                                                                 p_net_buffer_list,\r
+                                                                                 send_complete_flags );  \r
                return;\r
        }\r
        cl_obj_unlock( &p_port->obj );\r
@@ -5395,9 +5448,10 @@ ipoib_port_send(
        // You are already here at dispatch\r
 \r
        // We need to init the status here\r
-       // When completing the send, we will set the status NDIS_STATUS_FAILURE if AT LEAST\r
-       // one of NBs will fail.\r
-       // That is, status can't be updated back to SUCCESS if it previosly was set to FAILURE\r
+       // When completing the send, we will set the status NDIS_STATUS_FAILURE if\r
+       // AT LEAST one of NBs will fail.\r
+       // That is, status can't be updated back to SUCCESS if it previosly was set\r
+       // to FAILURE.\r
        NET_BUFFER_LIST_STATUS(p_net_buffer_list) = NDIS_STATUS_SUCCESS;\r
 \r
        for (p_netbuf = NET_BUFFER_LIST_FIRST_NB(p_net_buffer_list);\r
@@ -5414,7 +5468,8 @@ ipoib_port_send(
        ASSERT(buf_cnt);\r
 \r
        // Raise reference count of the NBL to the number of its NBs\r
-       IPOIB_GET_NET_BUFFER_LIST_REF_COUNT(p_net_buffer_list) = (PVOID)(ULONG_PTR)buf_cnt;\r
+       IPOIB_GET_NET_BUFFER_LIST_REF_COUNT(p_net_buffer_list) =\r
+                                                                                                       (PVOID)(ULONG_PTR)buf_cnt;\r
 \r
        for (p_netbuf = NET_BUFFER_LIST_FIRST_NB(p_net_buffer_list);\r
                 p_netbuf != NULL; \r
@@ -5422,15 +5477,16 @@ ipoib_port_send(
        {\r
                p_next_netbuf = NET_BUFFER_NEXT_NB(p_netbuf);\r
 \r
-               ipoib_send_NB_SG * s_buf = (ipoib_send_NB_SG*) (PVOID) (cl_qpool_get(&p_port->send_mgr.send_pool));\r
-               if (s_buf == NULL) {\r
+               ipoib_send_NB_SG * s_buf = (ipoib_send_NB_SG*) (PVOID)\r
+                                                                       (cl_qpool_get(&p_port->send_mgr.send_pool));\r
+               if (s_buf == NULL)\r
+               {\r
                        ASSERT(FALSE);\r
                        NET_BUFFER_LIST_STATUS(p_net_buffer_list) = NDIS_STATUS_RESOURCES;\r
-                       NdisMSendNetBufferListsCompleteX(\r
-                               p_port->p_adapter,\r
-                               p_net_buffer_list,\r
-                               send_complete_flags);   \r
-                               break;\r
+                       NdisMSendNetBufferListsCompleteX( p_port->p_adapter,\r
+                                                                                         p_net_buffer_list,\r
+                                                                                         send_complete_flags );        \r
+                       break;\r
                }\r
                        \r
                //Set all the data needed for process_sg_list\r
@@ -5475,35 +5531,31 @@ ipoib_port_send(
 \r
                        ++g_ipoib_send_SW_in_loop;\r
 \r
-                       ASSERT(s_buf->p_sg_buf);\r
-                       status = NdisMAllocateNetBufferSGList(\r
-                                                                       p_port->p_adapter->NdisMiniportDmaHandle,\r
-                                                                       p_netbuf,\r
-                                                                       s_buf,\r
-                                                                       NDIS_SG_LIST_WRITE_TO_DEVICE,\r
-                                                                       (PUCHAR )s_buf->p_sg_buf + sizeof(cl_pool_item_t),\r
-                                                                       p_port->p_adapter->sg_list_size);\r
+               status = NdisMAllocateNetBufferSGList(\r
+                                                       p_port->p_adapter->NdisMiniportDmaHandle,\r
+                                                       p_netbuf,\r
+                                                       s_buf,\r
+                                                       NDIS_SG_LIST_WRITE_TO_DEVICE,\r
+                                                       (PUCHAR )s_buf->p_sg_buf + sizeof(cl_pool_item_t),\r
+                                                       p_port->p_adapter->sg_list_size);\r
                        \r
-               \r
-                       cl_spinlock_acquire( &p_port->send_lock );              \r
+               cl_spinlock_acquire( &p_port->send_lock );      \r
 #endif\r
-//             }\r
-       \r
+\r
                if( status != NDIS_STATUS_SUCCESS )\r
                {\r
-\r
+                       IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
+                                               ("Partial Send @ line #%d\n  %s\n",__LINE__,__FILE__) );\r
                        ASSERT(FALSE);\r
-                       // TODOD: There is a bug here if we have succeeded in sending some and failed\r
-                       // with the otheres.\r
-\r
+                       // TODOD: There is a bug here if we have succeeded in sending some\r
+                       // and failed with the others.\r
                \r
                        /* fail net buffer list */\r
                        NET_BUFFER_LIST_STATUS(p_net_buffer_list) = status;\r
-                       NdisMSendNetBufferListsCompleteX(\r
-                               p_port->p_adapter,\r
-                               p_net_buffer_list,\r
-                               send_complete_flags);   \r
-                               break;\r
+                       NdisMSendNetBufferListsCompleteX( p_port->p_adapter,\r
+                                                                                         p_net_buffer_list,\r
+                                                                                         send_complete_flags );        \r
+                       break;\r
                }\r
        }\r
                \r
@@ -5519,19 +5571,19 @@ __send_complete_net_buffer(
        IN      ipoib_send_NB_SG        *s_buf, \r
        IN      NDIS_STATUS             status,\r
        IN      ULONG                           compl_flags,\r
-       IN      boolean_t                       bLock   \r
+       IN      boolean_t                       bLock ) \r
 {\r
        CL_ASSERT( s_buf );\r
        \r
-       IPOIB_PRINT(TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND,\r
-               ("Processing send completion for NBL=0x%p .\n", s_buf->p_nbl ));\r
+       IPOIB_PRINT(TRACE_LEVEL_VERBOSE, IPOIB_DBG_BUF,\r
+               ("Processing send completion for NBL %p s_buf %p\n",\r
+                       s_buf->p_nbl, s_buf));\r
        \r
        // Free SGL element allocated by NDIS\r
        // We should do it before freeing the whole NBL\r
-       NdisMFreeNetBufferSGList(\r
-                                                       s_buf->p_port->p_adapter->NdisMiniportDmaHandle,\r
-                                                       s_buf->p_sgl,\r
-                                                       s_buf->p_curr_nb);\r
+       NdisMFreeNetBufferSGList( s_buf->p_port->p_adapter->NdisMiniportDmaHandle,\r
+                                                         s_buf->p_sgl,\r
+                                                         s_buf->p_curr_nb );\r
        \r
        // No need to delete p_sg_buf at this state, we will destroy the whole list\r
        // at the end of the execution\r
@@ -5561,15 +5613,16 @@ __send_complete_net_buffer(
                case NDIS_STATUS_RESOURCES:\r
                default:\r
                        ASSERT(FALSE);\r
-               \r
        }\r
                \r
        IPOIB_DEC_NET_BUFFER_LIST_REF_COUNT(s_buf->p_nbl);\r
        /* Complete the NBL */\r
-       if (IPOIB_GET_NET_BUFFER_LIST_REF_COUNT(s_buf->p_nbl) == 0) {\r
+       if (IPOIB_GET_NET_BUFFER_LIST_REF_COUNT(s_buf->p_nbl) == 0)\r
+       {\r
                NET_BUFFER_LIST_STATUS(s_buf->p_nbl) = status;\r
                PNDIS_TCP_LARGE_SEND_OFFLOAD_NET_BUFFER_LIST_INFO pLsoInfo =    \r
-                       (PNDIS_TCP_LARGE_SEND_OFFLOAD_NET_BUFFER_LIST_INFO) (PULONG)&NET_BUFFER_LIST_INFO(s_buf->p_nbl, TcpLargeSendNetBufferListInfo);\r
+                       (PNDIS_TCP_LARGE_SEND_OFFLOAD_NET_BUFFER_LIST_INFO)\r
+                               (PULONG)&NET_BUFFER_LIST_INFO(s_buf->p_nbl, TcpLargeSendNetBufferListInfo);\r
         if(pLsoInfo->Transmit.Type == NDIS_TCP_LARGE_SEND_OFFLOAD_V1_TYPE)\r
                {            \r
                        UINT TcpPayLoad = 0;\r
@@ -5652,9 +5705,8 @@ ipoib_port_resume(
        if( p_port->state != IB_QPS_RTS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_SEND,\r
-                       ("Invalid port state =%d - Flushing the penging list\n", p_port->state) );\r
+                       ("Invalid port state =%d - Flush pending list\n", p_port->state) );\r
                b_good_port_state = FALSE;\r
-\r
        }\r
        cl_obj_unlock( &p_port->obj );\r
 \r
@@ -5665,16 +5717,14 @@ ipoib_port_resume(
        p_item =  cl_qlist_remove_head( &p_port->send_mgr.pending_list );\r
        while (p_item != cl_qlist_end(&p_port->send_mgr.pending_list))\r
        {\r
-\r
                s_buf = (ipoib_send_NB_SG*) (PVOID) p_item; // TODO: Check this casting\r
 \r
                if (!b_good_port_state) {\r
                        // Port is in error state, flush the list\r
                        ipoib_inc_send_stat( p_port->p_adapter, IP_STAT_DROPPED, 0 );\r
-                       __send_complete_net_buffer(\r
-                               s_buf, NDIS_STATUS_FAILURE, NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL, FALSE);\r
+                       __send_complete_net_buffer( s_buf, NDIS_STATUS_FAILURE,\r
+                                                       NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL, FALSE);\r
                } else {\r
-\r
                        /* Check the send queue and pend the request if not empty. */\r
                        if( p_port->send_mgr.depth == p_port->p_adapter->params.sq_depth )\r
                        {\r
@@ -5689,17 +5739,19 @@ ipoib_port_resume(
                        //cl_qlist_check_validity(&p_port->send_mgr.pending_list);\r
 \r
                        if (!continue_sending) {\r
-                               ASSERT (cl_is_item_in_qlist(&p_port->send_mgr.pending_list, (cl_list_item_t*)(PVOID)s_buf));\r
+                               ASSERT( cl_is_item_in_qlist(&p_port->send_mgr.pending_list,\r
+                                                                                       (cl_list_item_t*)(PVOID)s_buf) );\r
                                goto Cleanup;\r
                        }\r
                }\r
-                               \r
                p_item =  cl_qlist_remove_head( &p_port->send_mgr.pending_list );\r
        }\r
+\r
 Cleanup:\r
        IPOIB_EXIT( IPOIB_DBG_SEND );\r
 }\r
 \r
+\r
 //TODO: use s_buf-><data_member> directly, instead of useless copies\r
 \r
 static void\r
@@ -5750,14 +5802,18 @@ __send_cb(
        {\r
                p_free = wc;\r
                cl_perf_start( PollSend );\r
-               status = p_port->p_adapter->p_ifc->poll_cq( p_port->ib_mgr.h_send_cq, &p_free, &p_wc );\r
+               status = p_port->p_adapter->p_ifc->poll_cq( p_port->ib_mgr.h_send_cq,\r
+                                                                                                       &p_free,\r
+                                                                                                       &p_wc );\r
                cl_perf_stop( &p_port->p_adapter->perf, PollSend );\r
                CL_ASSERT( status == IB_SUCCESS || status == IB_NOT_FOUND );\r
 \r
                while( p_wc )\r
                {\r
                        cl_perf_start( SendComp );\r
-                       CL_ASSERT( p_wc->status != IB_WCS_SUCCESS || p_wc->wc_type == IB_WC_SEND || p_wc->wc_type == IB_WC_LSO);\r
+                       CL_ASSERT( p_wc->status != IB_WCS_SUCCESS ||\r
+                                               p_wc->wc_type == IB_WC_SEND || p_wc->wc_type == IB_WC_LSO);\r
+\r
                        s_buf = (ipoib_send_NB_SG*)(uintn_t)p_wc->wr_id;\r
                        IPOIB_PRINT(TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND,\r
                                ("Successfull send completion for NBL=0x%p .\n",  s_buf->p_nbl ));\r
@@ -5790,14 +5846,15 @@ __send_cb(
                                }\r
 \r
                                p_netbuffer = s_buf->p_curr_nb;\r
-                               ipoib_inc_send_stat( p_port->p_adapter, type, NET_BUFFER_DATA_LENGTH(p_netbuffer) );    \r
+                               ipoib_inc_send_stat( p_port->p_adapter, type,\r
+                                                                               NET_BUFFER_DATA_LENGTH(p_netbuffer) );  \r
                                status = NDIS_STATUS_SUCCESS;\r
                                break;\r
 \r
                        case IB_WCS_WR_FLUSHED_ERR:\r
                                IPOIB_PRINT(TRACE_LEVEL_INFORMATION, IPOIB_DBG_SEND,\r
                                        ("Flushed send completion.\n") );\r
-                                       ipoib_inc_send_stat( p_port->p_adapter, IP_STAT_DROPPED, 0 );\r
+                               ipoib_inc_send_stat( p_port->p_adapter, IP_STAT_DROPPED, 0 );\r
                                status = NDIS_STATUS_RESET_IN_PROGRESS;\r
                                \r
                                break;\r
@@ -5807,13 +5864,16 @@ __send_cb(
                                        ("Send failed with %s (vendor specific %#x)\n",\r
                                        p_port->p_adapter->p_ifc->get_wc_status_str( p_wc->status ),\r
                                        (int)p_wc->vendor_specific) );\r
-                                       ipoib_inc_send_stat( p_port->p_adapter, IP_STAT_ERROR, 0 );\r
+                               ipoib_inc_send_stat( p_port->p_adapter, IP_STAT_ERROR, 0 );\r
                                status = NDIS_STATUS_FAILURE;\r
                        \r
                                break;\r
                        }\r
                        \r
-                       __send_complete_net_buffer(s_buf, status, NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL, FALSE);\r
+                       __send_complete_net_buffer( s_buf,\r
+                                                                               status,\r
+                                                                               NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL,\r
+                                                                               FALSE );\r
                        \r
                        cl_atomic_dec( &p_port->send_mgr.depth );\r
 \r
@@ -5855,11 +5915,9 @@ static void
 __endpt_mgr_construct(\r
        IN                              ipoib_port_t* const                     p_port )\r
 {\r
-       IPOIB_ENTER( IPOIB_DBG_INIT );\r
        cl_qmap_init( &p_port->endpt_mgr.mac_endpts );\r
        cl_qmap_init( &p_port->endpt_mgr.lid_endpts );\r
        cl_fmap_init( &p_port->endpt_mgr.gid_endpts, __gid_cmp );\r
-       IPOIB_EXIT( IPOIB_DBG_INIT );\r
 }\r
 \r
 //TODO Restore CM\r
@@ -5936,19 +5994,22 @@ IN              void*           p_context )
                        \r
                        if( !p_endpt->conn.h_send_qp )\r
                        {\r
-                               ib_status = endpt_cm_create_qp( p_endpt, &p_endpt->conn.h_send_qp );\r
+                               ib_status = endpt_cm_create_qp( p_endpt,\r
+                                                                                               &p_endpt->conn.h_send_qp );\r
                                if( ib_status != IB_SUCCESS )\r
                                {\r
                                        IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                                               ("Endpt [%p ] CM create QP failed status %#x\n", p_endpt, ib_status ) );\r
+                                               ("Endpt %p CM create QP failed status %#x\n",\r
+                                               p_endpt, ib_status ) );\r
                                }\r
                                else\r
                                {\r
                                        ib_status = ipoib_endpt_connect( p_endpt );\r
                                        if( ib_status != IB_SUCCESS && ib_status != IB_PENDING )\r
                                        {\r
-                                               IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-                                                       ("Endpt [ %p ] conn REQ failed status %#x\n", p_endpt, ib_status ) );\r
+                                               IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
+                                                       ("Endpt %p conn REQ failed status %#x\n",\r
+                                                       p_endpt, ib_status ) );\r
                                        }\r
                                }\r
                                if( ib_status != IB_SUCCESS && ib_status != IB_PENDING )\r
@@ -5985,7 +6046,7 @@ IN                void*           p_context )
        NdisFreeSpinLock( &p_port->endpt_mgr.conn_lock );\r
        \r
        IPOIB_PRINT_EXIT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT, \r
-               (" Port [%d] Endpt thread is done\n", p_port->port_num ) );\r
+               (" Port [%d] Endpt_mgr thread is done\n", p_port->port_num ) );\r
 }\r
 #endif\r
 \r
@@ -6064,15 +6125,19 @@ __endpt_mgr_reset_all(
                        link_state.MediaConnectState = MediaConnectStateDisconnected;\r
                        link_state.MediaDuplexState = MediaDuplexStateFull;\r
                        link_state.XmitLinkSpeed =\r
-                       link_state.RcvLinkSpeed  = link_state.RcvLinkSpeed = SET_PORT_RATE_BPS( p_port->p_adapter->port_rate );\r
+                       link_state.RcvLinkSpeed  =\r
+                       link_state.RcvLinkSpeed  =\r
+                                                       SET_PORT_RATE_BPS( p_port->p_adapter->port_rate );\r
 \r
                        IPOIB_INIT_NDIS_STATUS_INDICATION(&status_indication,\r
                                                                p_port->p_adapter->h_adapter,\r
                                                                NDIS_STATUS_LINK_STATE,\r
                                                                (PVOID)&link_state,\r
                                                                sizeof(link_state));\r
-                       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT, ("Indicate DISCONNECT!\n") );\r
-                       NdisMIndicateStatusEx(p_port->p_adapter->h_adapter,&status_indication);\r
+                       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT,\r
+                                               ("Indicate DISCONNECT!\n") );\r
+                       NdisMIndicateStatusEx( p_port->p_adapter->h_adapter,\r
+                                                                  &status_indication );\r
                        \r
                        link_state.MediaConnectState = MediaConnectStateConnected;\r
                        IPOIB_INIT_NDIS_STATUS_INDICATION(&status_indication,\r
@@ -6080,8 +6145,10 @@ __endpt_mgr_reset_all(
                                                                NDIS_STATUS_LINK_STATE,\r
                                                                (PVOID)&link_state,\r
                                                                sizeof(link_state));\r
-                       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT, ("Indicate Connect\n") );\r
-                       NdisMIndicateStatusEx(p_port->p_adapter->h_adapter,&status_indication);\r
+                       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT,\r
+                                               ("Indicate Connect\n") );\r
+                       NdisMIndicateStatusEx( p_port->p_adapter->h_adapter,\r
+                                                                       &status_indication );\r
 \r
                \r
                                //      IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT,\r
@@ -6184,14 +6251,16 @@ __endpt_mgr_reset_all(
                KeSetEvent( &p_port->leave_mcast_event, EVENT_INCREMENT, FALSE );\r
        }       \r
 \r
-       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,("p_port->mcast_cnt = %d\n", p_port->mcast_cnt - local_exist));\r
+       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,\r
+                               ("p_port->mcast_cnt = %d\n", p_port->mcast_cnt - local_exist));\r
 \r
        /* Destroy all multicast endpoints now that we have released the lock. */\r
        while( cl_qlist_count( &mc_list ) )\r
        {\r
                cl_list_item_t  *p_item;\r
                p_item = cl_qlist_remove_head( &mc_list );\r
-               p_endpt = PARENT_STRUCT(p_item, ipoib_endpt_t, mac_item.pool_item.list_item);\r
+               p_endpt = PARENT_STRUCT(p_item, ipoib_endpt_t,\r
+                                                               mac_item.pool_item.list_item);\r
                cl_obj_destroy( &p_endpt->obj);\r
        }\r
 \r
@@ -6239,14 +6308,13 @@ __endpt_mgr_remove(
                if( p_fmap_item != cl_fmap_end( &p_port->endpt_mgr.conn_endpts ) )\r
                {\r
                        cl_fmap_remove_item( &p_port->endpt_mgr.conn_endpts, \r
-                               &p_endpt->conn_item );\r
+                                                                &p_endpt->conn_item );\r
                }\r
        }\r
 #endif \r
        if( p_endpt->dlid )\r
        {\r
-               cl_qmap_remove_item( &p_port->endpt_mgr.lid_endpts,\r
-                       &p_endpt->lid_item );\r
+               cl_qmap_remove_item( &p_port->endpt_mgr.lid_endpts, &p_endpt->lid_item );\r
        }\r
 \r
        cl_obj_unlock( &p_port->obj );\r
@@ -6544,7 +6612,7 @@ __endpt_mgr_insert_locked(
                cl_obj_unlock( &p_port->obj );\r
                cl_obj_lock( &p_port->obj );\r
        }\r
-       /* __endpt_mgr_insert expects *one* reference to be held when being called. */\r
+       /* __endpt_mgr_insert expects *1* reference to be held when being called */\r
        cl_atomic_inc( &p_port->endpt_rdr );\r
        status= __endpt_mgr_insert( p_port, mac, p_endpt );\r
        cl_atomic_dec( &p_port->endpt_rdr );\r
@@ -6590,16 +6658,21 @@ __endpt_mgr_insert(
        p_endpt->mac = mac;\r
        key = 0;\r
        cl_memcpy( &key, &mac, sizeof(mac_addr_t) );\r
-       p_qitem = cl_qmap_insert(\r
-               &p_port->endpt_mgr.mac_endpts, key, &p_endpt->mac_item );\r
+       p_qitem = cl_qmap_insert( &p_port->endpt_mgr.mac_endpts,\r
+                                                         key,\r
+                                                         &p_endpt->mac_item );\r
        CL_ASSERT( p_qitem == &p_endpt->mac_item );\r
-       p_fitem = cl_fmap_insert(\r
-               &p_port->endpt_mgr.gid_endpts, &p_endpt->dgid, &p_endpt->gid_item );\r
+\r
+       p_fitem = cl_fmap_insert( &p_port->endpt_mgr.gid_endpts,\r
+                                                         &p_endpt->dgid,\r
+                                                         &p_endpt->gid_item );\r
        CL_ASSERT( p_fitem == &p_endpt->gid_item );\r
+\r
        if( p_endpt->dlid )\r
        {\r
-               p_qitem = cl_qmap_insert(\r
-                       &p_port->endpt_mgr.lid_endpts, p_endpt->dlid, &p_endpt->lid_item );\r
+               p_qitem = cl_qmap_insert( &p_port->endpt_mgr.lid_endpts,\r
+                                                                 p_endpt->dlid,\r
+                                                                 &p_endpt->lid_item );\r
                CL_ASSERT( p_qitem == &p_endpt->lid_item );\r
                if (p_qitem != &p_endpt->lid_item) {\r
                        // Since we failed to insert into the list, make sure it is not removed\r
@@ -6630,7 +6703,8 @@ __endpt_mgr_add_bcast(
 \r
        /* Allocate the broadcast endpoint. */\r
        p_endpt = ipoib_endpt_create( &p_mcast_rec->p_member_rec->mgid,\r
-               0 , CL_HTON32(0x00FFFFFF) );\r
+                                                                 0,\r
+                                                                 CL_HTON32(0x00FFFFFF) );\r
        if( !p_endpt )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
@@ -6640,8 +6714,10 @@ __endpt_mgr_add_bcast(
        /* set reference to transport to be used while is not attached to the port */\r
        p_endpt->is_mcast_listener = TRUE;\r
        p_endpt->p_ifc = p_port->p_adapter->p_ifc;\r
-       status = ipoib_endpt_set_mcast( p_endpt, p_port->ib_mgr.h_pd,\r
-               p_port->port_num, p_mcast_rec );\r
+       status = ipoib_endpt_set_mcast( p_endpt,\r
+                                                                       p_port->ib_mgr.h_pd,\r
+                                                                       p_port->port_num,\r
+                                                                       p_mcast_rec );\r
        if( status != IB_SUCCESS )\r
        {\r
                cl_obj_destroy( &p_endpt->obj );\r
@@ -6678,6 +6754,7 @@ ipoib_port_remove_endpt(
 \r
        /* Remove the endpoint from the maps so further requests don't find it. */\r
        cl_obj_lock( &p_port->obj );\r
+\r
        /* Wait for all readers to finish */\r
        while( p_port->endpt_rdr )\r
                ;\r
@@ -6690,7 +6767,7 @@ ipoib_port_remove_endpt(
        {\r
                p_endpt = PARENT_STRUCT( p_item, ipoib_endpt_t, mac_item );\r
                /*\r
-                * The enpoints are *ALWAYS* in both the MAC and GID maps.  They are only\r
+                * The enpoints are *ALWAYS* in both the MAC and GID maps. They are only\r
                 * in the LID map if the GID has the same subnet prefix as us.\r
                 */\r
                cl_fmap_remove_item(\r
@@ -6698,7 +6775,8 @@ ipoib_port_remove_endpt(
 #if 0\r
                if( p_port->p_adapter->params.cm_enabled )\r
                {\r
-                       p_fmap_item = cl_fmap_get( &p_port->endpt_mgr.conn_endpts, &p_endpt->dgid );\r
+                       p_fmap_item = cl_fmap_get( &p_port->endpt_mgr.conn_endpts,\r
+                                                                               &p_endpt->dgid );\r
                \r
                        if( p_fmap_item != cl_fmap_end( &p_port->endpt_mgr.conn_endpts ) )\r
                        {\r
@@ -6725,12 +6803,9 @@ ipoib_port_remove_endpt(
                IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,\r
                        ("ref type %d ref_cnt %d\n", ref_endpt_track, p_port->obj.ref_cnt) );\r
 #endif\r
-\r
        }\r
        else\r
-       {\r
                cl_obj_unlock( &p_port->obj );\r
-       }\r
 \r
        IPOIB_EXIT( IPOIB_DBG_ENDPT );\r
 }\r
@@ -6819,9 +6894,10 @@ ipoib_port_up(
        mad_in->class_ver =1;\r
        mad_in->mgmt_class = IB_MCLASS_SUBN_LID;\r
        \r
-       status = p_port->p_adapter->p_ifc->local_mad(\r
-               p_port->ib_mgr.h_ca ,p_port->port_num ,mad_in ,mad_out);\r
-\r
+       status = p_port->p_adapter->p_ifc->local_mad( p_port->ib_mgr.h_ca,\r
+                                                                                                 p_port->port_num,\r
+                                                                                                 mad_in,\r
+                                                                                                 mad_out );\r
        if( status != IB_SUCCESS )\r
        {\r
                ipoib_set_inactive( p_port->p_adapter );\r
@@ -6834,19 +6910,21 @@ ipoib_port_up(
        p_port_info = (ib_port_info_t*)(((ib_smp_t*)mad_out)->data);\r
        p_port->base_lid = p_pnp_rec->p_port_attr->lid;\r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT,\r
-                       ("Received port info: link width = %d.\n",\r
+               ("Received port info: link width = %d.\n",\r
                        p_port_info->link_width_active) );\r
-       p_port->ib_mgr.rate =\r
-               ib_port_info_compute_rate( p_port_info );\r
+       p_port->ib_mgr.rate = ib_port_info_compute_rate( p_port_info );\r
        \r
        ipoib_set_rate( p_port->p_adapter,\r
-               p_port_info->link_width_active,\r
-       ib_port_info_get_link_speed_active( p_port_info ) );\r
+                                       p_port_info->link_width_active,\r
+                                       ib_port_info_get_link_speed_active( p_port_info ) );\r
 \r
        status = __port_get_bcast( p_port );\r
        if (status != IB_SUCCESS)\r
+       {\r
                IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
-               (" __port_get_bcast returned %s\n",p_port->p_adapter->p_ifc->get_err_str( status )));\r
+                       (" __port_get_bcast returned %s\n",\r
+                               p_port->p_adapter->p_ifc->get_err_str( status )));\r
+       }\r
 \r
 up_done:\r
        if( status != IB_SUCCESS )\r
@@ -6883,8 +6961,7 @@ __endpt_mgr_add_local(
        IPOIB_ENTER( IPOIB_DBG_INIT );\r
 \r
        ib_gid_set_default( &gid, p_port->p_adapter->guids.port_guid.guid );\r
-       p_endpt = ipoib_endpt_create(\r
-               &gid, p_port_info->base_lid, p_port->ib_mgr.qpn );\r
+       p_endpt = ipoib_endpt_create( &gid, p_port_info->base_lid, p_port->ib_mgr.qpn );\r
        if( !p_endpt )\r
        {\r
                p_port->p_adapter->hung = TRUE;\r
@@ -6897,7 +6974,8 @@ __endpt_mgr_add_local(
        av_attr.port_num = p_port->port_num;\r
        av_attr.sl = 0;\r
        IPOIB_PRINT_EXIT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,\r
-               (" av_attr.dlid = p_port_info->base_lid = %d\n", cl_ntoh16( p_port_info->base_lid ) ));\r
+               (" av_attr.dlid = p_port_info->base_lid = %d\n",\r
+                       cl_ntoh16( p_port_info->base_lid ) ));\r
        av_attr.dlid = p_port_info->base_lid;\r
        av_attr.static_rate = p_port->ib_mgr.rate;\r
        av_attr.path_bits = 0;\r
@@ -6908,19 +6986,21 @@ __endpt_mgr_add_local(
                cl_obj_destroy( &p_endpt->obj );\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
                        ("ib_create_av for local endpoint returned %s\n",\r
-                       p_port->p_adapter->p_ifc->get_err_str( status )) );\r
+                               p_port->p_adapter->p_ifc->get_err_str( status )) );\r
                return status;\r
        }\r
 \r
        /* __endpt_mgr_insert expects *one* reference to be held. */\r
        cl_atomic_inc( &p_port->endpt_rdr );\r
-       status = __endpt_mgr_insert( p_port, p_port->p_adapter->params.conf_mac, p_endpt );\r
+       status = __endpt_mgr_insert( p_port,\r
+                                                                p_port->p_adapter->params.conf_mac,\r
+                                                                p_endpt );\r
        cl_atomic_dec( &p_port->endpt_rdr );\r
        if( status != IB_SUCCESS )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
                        ("__endpt_mgr_insert for local endpoint returned %s\n",\r
-                       p_port->p_adapter->p_ifc->get_err_str( status )) );\r
+                               p_port->p_adapter->p_ifc->get_err_str( status )) );\r
                return status;\r
        }\r
 \r
@@ -6931,8 +7011,6 @@ __endpt_mgr_add_local(
 }\r
 \r
 \r
-\r
-\r
 static ib_api_status_t\r
 __port_get_bcast(\r
        IN                              ipoib_port_t* const                     p_port )\r
@@ -6969,8 +7047,9 @@ __port_get_bcast(
        /* reference the object for the multicast query. */\r
        ipoib_port_ref( p_port, ref_get_bcast );\r
 \r
-       status = p_port->p_adapter->p_ifc->query(\r
-               p_port->p_adapter->h_al, &query, &p_port->ib_mgr.h_query );\r
+       status = p_port->p_adapter->p_ifc->query( p_port->p_adapter->h_al,\r
+                                                                                         &query,\r
+                                                                                         &p_port->ib_mgr.h_query );\r
        if( status != IB_SUCCESS )\r
        {\r
                ipoib_port_deref( p_port, ref_get_bcast );\r
@@ -7013,7 +7092,7 @@ __bcast_get_cb(
 \r
        IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT,\r
                ("status of request %s\n", \r
-               p_port->p_adapter->p_ifc->get_err_str( status )) );\r
+                       p_port->p_adapter->p_ifc->get_err_str( status )) );\r
 \r
        switch( status )\r
        {\r
@@ -7159,7 +7238,7 @@ __port_create_bcast(
        mcast_req.member_rec.mgid.raw[4] = (uint8_t) (p_port->p_adapter->guids.port_guid.pkey >> 8); \r
        mcast_req.member_rec.mgid.raw[5] = (uint8_t) p_port->p_adapter->guids.port_guid.pkey;\r
        ib_gid_set_default( &mcast_req.member_rec.port_gid,\r
-               p_port->p_adapter->guids.port_guid.guid );\r
+                                               p_port->p_adapter->guids.port_guid.guid );\r
        /*\r
         * IPOIB spec requires that the QKEY have the MSb set so that the QKEY\r
         * from the QP is used rather than the QKEY in the send WR.\r
@@ -7293,7 +7372,8 @@ __bcast_cb(
                if( p_mcast_rec->status == IB_SUCCESS )\r
                {\r
                        ipoib_port_ref(p_port, ref_leave_mcast);\r
-                       p_port->p_adapter->p_ifc->leave_mcast( p_mcast_rec->h_mcast, __leave_error_mcast_cb );\r
+                       p_port->p_adapter->p_ifc->leave_mcast( p_mcast_rec->h_mcast,\r
+                                                                                                  __leave_error_mcast_cb );\r
                }\r
                KeSetEvent( &p_port->sa_event, EVENT_INCREMENT, FALSE );\r
                ipoib_port_deref( p_port, ref_bcast_inv_state );\r
@@ -7388,7 +7468,8 @@ __bcast_cb(
                        ("__endpt_mgr_add_bcast returned %s\n",\r
                        p_port->p_adapter->p_ifc->get_err_str( status )) );\r
                ipoib_port_ref(p_port, ref_leave_mcast);\r
-               status = p_port->p_adapter->p_ifc->leave_mcast( p_mcast_rec->h_mcast, __leave_error_mcast_cb );\r
+               status = p_port->p_adapter->p_ifc->leave_mcast( p_mcast_rec->h_mcast,\r
+                                                                                                               __leave_error_mcast_cb );\r
                CL_ASSERT( status == IB_SUCCESS );\r
                goto err;\r
        }\r
@@ -7455,13 +7536,13 @@ err:
                ipoib_port_deref( p_port, ref_join_bcast );\r
                return;\r
        }\r
-#if 0 //CM\r
+#if IPOIB_CM //CM\r
        if( p_port->p_adapter->params.cm_enabled &&\r
                !p_port->p_local_endpt->conn.h_cm_listen )\r
        {\r
                if( ipoib_port_listen( p_port ) != IB_SUCCESS )\r
                {\r
-                       IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
+                       IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
                                ("Port CM Listen failed\n" ) );\r
                        /*keep going with UD only */\r
                        p_port->p_adapter->params.cm_enabled = FALSE;\r
@@ -7563,6 +7644,7 @@ __ib_mgr_activate(
 \r
 \r
 /* Transition to a passive level thread. */\r
+\r
 ib_api_status_t\r
 ipoib_port_join_mcast(\r
        IN                              ipoib_port_t* const                     p_port,\r
@@ -7597,10 +7679,12 @@ ipoib_port_join_mcast(
        case NDIS_STATUS_PENDING:\r
                IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,\r
                        ("<ipoib_port_join_mcast> PENDING\n") );\r
-               IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,("__endpt_mgr_ref called for %p\n", p_endpt));\r
+               IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,\r
+                       ("__endpt_mgr_ref called for %p\n", p_endpt));\r
                return IB_SUCCESS;\r
        }\r
-       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,("__endpt_mgr_ref called for %p\n", p_endpt));\r
+       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ENDPT,\r
+               ("__endpt_mgr_ref called for %p\n", p_endpt));\r
        /*\r
         * Issue the mcast request, using the parameters of the broadcast group.\r
         * This allows us to do a create request that should always succeed since\r
@@ -7653,8 +7737,9 @@ ipoib_port_join_mcast(
         * mcast callback is invoked, it would not find the corresponding endpoint\r
         * and would be undone.\r
         */\r
-       p_endpt = ipoib_endpt_create(\r
-               &mcast_req.member_rec.mgid, 0, CL_HTON32(0x00FFFFFF) );\r
+       p_endpt = ipoib_endpt_create( &mcast_req.member_rec.mgid,\r
+                                                                 0,\r
+                                                                 CL_HTON32(0x00FFFFFF) );\r
        if( !p_endpt )\r
        {\r
                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
@@ -7722,11 +7807,14 @@ __mcast_cb(
 \r
                {\r
                        ipoib_port_ref(p_port, ref_leave_mcast);\r
-                       p_port->p_adapter->p_ifc->leave_mcast( p_mcast_rec->h_mcast, __leave_error_mcast_cb );\r
+                       p_port->p_adapter->p_ifc->leave_mcast( p_mcast_rec->h_mcast,\r
+                                                                                                  __leave_error_mcast_cb );\r
                }\r
                ipoib_port_deref( p_port, ref_mcast_inv_state );\r
-               IPOIB_PRINT_EXIT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST ,("Invalid state - Aborting.\n") );\r
-               IPOIB_PRINT_EXIT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT ,("Invalid state - Aborting.\n") );\r
+               IPOIB_PRINT_EXIT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,\r
+                       ("Invalid state - Aborting.\n") );\r
+               IPOIB_PRINT_EXIT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_INIT,\r
+                       ("Invalid state - Aborting.\n") );\r
 \r
                cl_spinlock_acquire(&p_port->send_lock);\r
                //ipoib_port_resume(p_port , FALSE);\r
@@ -7740,7 +7828,7 @@ __mcast_cb(
                cl_obj_unlock( &p_port->obj );\r
                IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
                        ("Multicast join request failed with status %s.\n",\r
-                       p_port->p_adapter->p_ifc->get_err_str( p_mcast_rec->status )) );\r
+                               p_port->p_adapter->p_ifc->get_err_str( p_mcast_rec->status )) );\r
                /* Flag the adapter as hung. */\r
                p_port->p_adapter->hung =TRUE;\r
                ipoib_port_deref( p_port, ref_mcast_req_failed );\r
@@ -7748,8 +7836,8 @@ __mcast_cb(
                return;\r
        }\r
 \r
-       p_item = cl_fmap_get(\r
-               &p_port->endpt_mgr.gid_endpts, &p_mcast_rec->p_member_rec->mgid );\r
+       p_item = cl_fmap_get( &p_port->endpt_mgr.gid_endpts,\r
+                                                 &p_mcast_rec->p_member_rec->mgid );\r
        if( p_item == cl_fmap_end( &p_port->endpt_mgr.gid_endpts ) )\r
        {\r
                /*\r
@@ -7762,7 +7850,8 @@ __mcast_cb(
                        ("Failed to find endpoint for update.\n") );\r
 \r
                ipoib_port_ref(p_port, ref_leave_mcast);\r
-               p_port->p_adapter->p_ifc->leave_mcast( p_mcast_rec->h_mcast, __leave_error_mcast_cb );\r
+               p_port->p_adapter->p_ifc->leave_mcast( p_mcast_rec->h_mcast,\r
+                                                                                          __leave_error_mcast_cb );\r
                ipoib_port_deref( p_port, ref_mcast_no_endpt );\r
                IPOIB_EXIT( IPOIB_DBG_MCAST );\r
                return;\r
@@ -7772,14 +7861,16 @@ __mcast_cb(
        p_endpt->p_ifc = p_port->p_adapter->p_ifc;\r
 \r
        /* Setup the endpoint for use. */\r
-       status = ipoib_endpt_set_mcast(\r
-               p_endpt, p_port->ib_mgr.h_pd, p_port->port_num, p_mcast_rec );\r
+       status = ipoib_endpt_set_mcast( p_endpt,\r
+                                                                       p_port->ib_mgr.h_pd,\r
+                                                                       p_port->port_num,\r
+                                                                       p_mcast_rec );\r
        if( status != IB_SUCCESS )\r
        {\r
                cl_obj_unlock( &p_port->obj );\r
                IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_MCAST,\r
                        ("ipoib_endpt_set_mcast returned %s.\n",\r
-                       p_port->p_adapter->p_ifc->get_err_str( status )) );\r
+                               p_port->p_adapter->p_ifc->get_err_str( status )) );\r
                /* Flag the adapter as hung. */\r
                p_port->p_adapter->hung = TRUE;\r
                ipoib_port_deref( p_port, ref_mcast_av_failed );\r
@@ -7798,7 +7889,8 @@ __mcast_cb(
        \r
        /* Try to send all pending sends. */\r
        cl_spinlock_acquire( &p_port->send_lock );\r
-       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST, ("Calling ipoib_port_resume from mcast_cb\n"));\r
+       IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,\r
+               ("Calling ipoib_port_resume from mcast_cb, xmit pending sends\n"));\r
        ipoib_port_resume(p_port , FALSE);\r
        cl_spinlock_release( &p_port->send_lock );\r
 \r
@@ -7818,7 +7910,8 @@ ipoib_leave_mcast_cb(
 \r
        p_port = (ipoib_port_t*)context;\r
 \r
-       IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_MCAST,("p_port->mcast_cnt = %d\n", p_port->mcast_cnt));\r
+       IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_MCAST,\r
+               ("p_port->mcast_cnt %d\n", p_port->mcast_cnt));\r
        \r
        ipoib_port_deref( p_port, ref_leave_mcast);\r
        //It happens\r
@@ -8197,12 +8290,11 @@ ipoib_port_cancel_xmit(
 \r
                        \r
                        //TODO don't use DISPATCH LEVEL\r
-                       __send_complete_net_buffer(\r
-                               s_buf, NDIS_STATUS_SEND_ABORTED ,NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL, TRUE);\r
+                       __send_complete_net_buffer( s_buf, NDIS_STATUS_SEND_ABORTED,\r
+                                                               NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL, TRUE);\r
                }\r
                        \r
        }\r
-\r
        IPOIB_EXIT( IPOIB_DBG_SEND );\r
 }\r
 \r
index bec11309d3e647259d60f887e3b920b44f0b3df7..fa1835c92de34053a0082170b9a0a81ad1a8bc5c 100644 (file)
 \r
 \r
 //Used in SEND flow\r
-#define IPOIB_GET_NET_BUFFER_LIST_REF_COUNT(_NetBufferList)    ((_NetBufferList)->MiniportReserved[0])\r
-#define IPOIB_DEC_NET_BUFFER_LIST_REF_COUNT(_NetBufferList)    (*(PULONG)&(_NetBufferList)->MiniportReserved[0])--\r
+#define IPOIB_GET_NET_BUFFER_LIST_REF_COUNT(_NetBufferList)    \\r
+       ((_NetBufferList)->MiniportReserved[0])\r
+\r
+#define IPOIB_DEC_NET_BUFFER_LIST_REF_COUNT(_NetBufferList)    \\r
+       (*(PULONG)&(_NetBufferList)->MiniportReserved[0])--\r
 \r
 \r
 \r
@@ -328,7 +331,6 @@ typedef struct _ipoib_buf_mgr
 *              than can fit in the local data segments).\r
 *********/\r
 \r
-\r
 typedef enum _ipoib_pkt_type\r
 {\r
        PKT_TYPE_UCAST,\r
@@ -398,6 +400,8 @@ typedef struct _ipoib_recv_desc
 *      The pool item is always first to allow casting form a cl_pool_item_t or\r
 *      cl_list_item_t to the descriptor.\r
 *********/\r
+\r
+\r
 typedef struct __ipoib_send_wr\r
 {\r
        ib_send_wr_t            wr;\r
@@ -451,29 +455,24 @@ typedef struct _ipoib_send_desc
 typedef struct _ipoib_recv_mgr\r
 {\r
        int32_t                 depth;\r
-\r
        NET_BUFFER_LIST **recv_NBL_array;\r
-\r
        cl_qlist_t              done_list;\r
 \r
 }      ipoib_recv_mgr_t;\r
 /*\r
 * FIELDS\r
 *      depth\r
-*              Current number of WRs posted.\r
-*\r
-*      p_head\r
-*              Pointer to work completion in descriptor at the head of the QP.\r
-*\r
-*      p_tail\r
-*              Pointer to the work completion in the descriptor at the tail of the QP.\r
+*              Current number of RX WRs posted.\r
 *\r
 *      recv_NBL_array\r
-*              Array of pointers to NDIS_PACKET used to indicate receives.\r
+*              Array of NBLs (NET_BUFFER_LIST) pointers used to indicate receives.\r
 *\r
 *      done_list\r
-*              List of receive descriptors that need to be indicated to NDIS.\r
+*              List of receive descriptors (ipoib_desc_t) polled from the RX CQ which\r
+*              are used to construct the recv_NBL_array, which is then used to indicated\r
+*              received packets to NDIS 6.\r
 *********/\r
+\r
 #if 0\r
 class ItemListElement: public cl_list_item_t {\r
        public:\r
@@ -610,7 +609,6 @@ typedef struct _ipoib_port
        KDPC                                    recv_dpc;\r
 \r
        ipoib_endpt_mgr_t               endpt_mgr;\r
-\r
        endpt_buf_mgr_t                 cm_buf_mgr;\r
        endpt_recv_mgr_t                cm_recv_mgr;\r
 \r
@@ -685,6 +683,7 @@ public:
        ipoib_send_NB_SG(): p_port(NULL), p_nbl (NULL), p_curr_nb(NULL), p_endpt(NULL), p_send_buf(NULL), p_sgl(NULL) {};\r
        virtual ~ipoib_send_NB_SG();\r
 #endif\r
+\r
 typedef struct ipoib_send_NB_SG_t {\r
 //private: //TODO make data private\r
        cl_pool_item_t                  pool_item;\r
@@ -771,11 +770,11 @@ ipoib_process_sg_list(
     IN  PVOID                   Context);\r
     \r
 inline void ipoib_port_ref(\r
-       IN                              ipoib_port_t *                          p_port, \r
+       IN                              ipoib_port_t *                  p_port, \r
        IN                              int                                             type);\r
 \r
 inline void ipoib_port_deref(\r
-       IN                              ipoib_port_t *                          p_port,\r
+       IN                              ipoib_port_t *                  p_port,\r
        IN                              int                                             type);\r
 \r
 #if 0\r
@@ -929,7 +928,8 @@ static inline VOID NdisMSendNetBufferListsCompleteX(
 \r
        if (NET_BUFFER_LIST_STATUS(NetBufferLists) != NDIS_STATUS_SUCCESS) {\r
                IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_ALL,\r
-                       ("NBL completed with error %d to NDIS\n", NET_BUFFER_LIST_STATUS(NetBufferLists)));\r
+                       ("NBL completed with error %d to NDIS\n",\r
+                               NET_BUFFER_LIST_STATUS(NetBufferLists)));\r
        }\r
        IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_SEND,\r
                                ("Completing NBL=%x, g_NBL=%d, g_NBL_completed=%d \n", NetBufferLists, g_NBL, g_NBL_complete) );\r