--- A/ulp/ipoib_NDIS6_CM/kernel/ipoib_driver.cpp	Fri Dec 10 10:58:51 2010
+++ B/ulp/ipoib_NDIS6_CM/kernel/ipoib_driver.cpp	Fri Dec 10 10:49:10 2010
@@ -241,7 +241,8 @@
 	IPOIB_INIT_NDIS_STRING(&AdapterInstanceName);
 	if (NdisMQueryAdapterInstanceName(&AdapterInstanceName, h_adapter)!= NDIS_STATUS_SUCCESS ){
 		ASSERT(FALSE);
-		IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR,IPOIB_DBG_ERROR, ("[IPoIB] Init:Failed to retreive adapter name.\n"));
+		IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR,IPOIB_DBG_ERROR,
+			("[IPoIB] Init:Failed to retreive adapter name.\n"));
 		return;
 	}
 	logMsgArray[0] = AdapterInstanceName.Buffer;
@@ -474,8 +475,11 @@
 	characteristics.CancelSendHandler			= ipoib_cancel_xmit;
 	characteristics.ShutdownHandlerEx			= ipoib_shutdown_ex;
 
-	status = NdisMRegisterMiniportDriver(
-		p_drv_obj, p_registry_path,(PNDIS_HANDLE)&g_IpoibDriverContext, &characteristics,&g_IpoibMiniportDriverHandle );
+	status = NdisMRegisterMiniportDriver( p_drv_obj,
+										  p_registry_path,
+										  (PNDIS_HANDLE)&g_IpoibDriverContext, 
+										  &characteristics,
+										  &g_IpoibMiniportDriverHandle );
 	if( status != NDIS_STATUS_SUCCESS )
 	{
 		IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR, 
@@ -679,7 +683,9 @@
 			else
 			{
 				ipoib_create_log(p_adapter->h_adapter, i, EVENT_IPOIB_WRONG_PARAMETER_INFO);
-				IPOIB_PRINT(TRACE_LEVEL_VERBOSE, IPOIB_DBG_INIT, ("Read configuration. Registry %S value not found, Value= 0x%x\n", pRegEntry[i].RegName.Buffer, value));
+				IPOIB_PRINT(TRACE_LEVEL_VERBOSE, IPOIB_DBG_INIT,
+					("Read configuration. Registry %S value not found, Value 0x%x\n",
+						pRegEntry[i].RegName.Buffer, value));
 			}
 		}
 		//
@@ -868,8 +874,7 @@
 NDIS_STATUS
 SetDeviceRegistrationAttributes(
 	ipoib_adapter_t *p_adapter,
-	NDIS_HANDLE	h_adapter
-	)
+	NDIS_HANDLE	h_adapter )
 {
 	NDIS_MINIPORT_ADD_DEVICE_REGISTRATION_ATTRIBUTES atr;
 	NTSTATUS Status;
@@ -1022,8 +1027,7 @@
 NDIS_STATUS
 SetGenericAttributes(
 	ipoib_adapter_t *p_adapter,
-	NDIS_HANDLE	h_adapter
-	)
+	NDIS_HANDLE	h_adapter )
 {
 	NDIS_STATUS Status;
 
@@ -1089,7 +1093,6 @@
 	gat.IfConnectorPresent = TRUE; 
 	gat.AccessType = NET_IF_ACCESS_BROADCAST; // NET_IF_ACCESS_BROADCAST for a typical ethernet adapter
 
-
 	//TODO NDIS60 is it possible to reduce unsupported statistics
 	gat.SupportedStatistics = 
 							NDIS_STATISTICS_XMIT_OK_SUPPORTED |
@@ -1421,7 +1424,6 @@
 		return Status;
 	}
 
-
 	Status = SetAdapterRegistrationAttributes(p_adapter, h_adapter);
 	if (Status != NDIS_STATUS_SUCCESS)
 	{
@@ -1431,8 +1433,6 @@
 		return Status;
 	}
 
-	
-	
 #if 0
 	if(!pPort->Config.fWHQL)
 	{
@@ -1622,8 +1622,8 @@
 		StatusIndicationFlag = TRUE;
 	}
 
-	else if ((pOffloadParam->IPv4Checksum ==	NDIS_OFFLOAD_PARAMETERS_RX_ENABLED_TX_DISABLED) ||
-		(pOffloadParam->TCPIPv4Checksum ==	NDIS_OFFLOAD_PARAMETERS_RX_ENABLED_TX_DISABLED) ||
+	else if ((pOffloadParam->IPv4Checksum == NDIS_OFFLOAD_PARAMETERS_RX_ENABLED_TX_DISABLED) ||
+		(pOffloadParam->TCPIPv4Checksum == NDIS_OFFLOAD_PARAMETERS_RX_ENABLED_TX_DISABLED) ||
 		(pOffloadParam->UDPIPv4Checksum ==	NDIS_OFFLOAD_PARAMETERS_RX_ENABLED_TX_DISABLED))
 	{
 		p_adapter->params.recv_chksum_offload = CSUM_ENABLED;
@@ -3041,7 +3041,6 @@
 		 status = SetOffloadEncapsulation(info_buf, info_buf_len);
 		 break;
 
-
 	case OID_GEN_SUPPORTED_LIST:
 	//case OID_GEN_HARDWARE_STATUS:
 	case OID_GEN_MEDIA_SUPPORTED:
@@ -3214,9 +3213,8 @@
 compl_status:
 	if (status != NDIS_STATUS_SUCCESS)
 	{
-
 		IPOIB_PRINT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,
-				("Got bad status, g_NBL=%d, g_NBL_completed=%d \n",
+			("Got bad status, g_NBL=%d, g_NBL_completed=%d \n",
 				g_NBL, g_NBL_complete) );
 		send_complete_flags = 0;
 		
@@ -3231,7 +3229,7 @@
 			NET_BUFFER_LIST_STATUS(curr_net_buffer_list) = status;
 			ipoib_inc_send_stat( p_adapter, IP_STAT_DROPPED, 0 );
 		}
-		// Put attention, we complete here the LIST OF NBL at one shot
+		// Pay attention, we complete here the LIST OF NBL in one shot
 		if (NDIS_TEST_SEND_AT_DISPATCH_LEVEL(send_flags))
 		{
 			ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
@@ -3240,7 +3238,7 @@
 		}
 		NdisMSendNetBufferListsCompleteX( p_adapter,
 										  net_buffer_list,
-										  send_complete_flags); 
+										  send_complete_flags ); 
 	}
 	IPOIB_EXIT( IPOIB_DBG_SEND );
 }
@@ -3826,8 +3824,10 @@
 			IPOIB_PRINT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_OBJ,
 				("[%p] Adapter refcount raised to %d\n",
 					p_adapter, p_adapter->obj.ref_cnt));
-		ib_status = p_adapter->p_ifc->reg_svc(
-			p_adapter->h_al, &ib_service, &p_addr_item->p_reg->h_reg_svc );
+
+		ib_status = p_adapter->p_ifc->reg_svc( p_adapter->h_al, &ib_service,
+												&p_addr_item->p_reg->h_reg_svc );
+
 		if( ib_status != IB_SUCCESS )
 		{
 			if( ib_status == IB_INVALID_GUID )