--- A/ulp/ipoib_NDIS6_CM/kernel/SOURCES	Tue Jan 11 17:53:01 2011
+++ B/ulp/ipoib_NDIS6_CM/kernel/SOURCES	Tue Jan 11 17:16:28 2011
@@ -14,7 +14,6 @@
 #ENABLE_EVENT_TRACING=1
 !endif
 
-
 SOURCES=ipoib_log.mc \
 		ipoib.rc \
 		ipoib_driver.cpp \
@@ -22,28 +21,35 @@
 		ipoib_endpoint.cpp \
 		ipoib_port.cpp \
 		ipoib_ibat.cpp \
-#		ipoib_cm.cpp	\
+		ipoib_cm.cpp	\
 		ipoib_xfr_mgr.cpp \
-		ipoib_stat.cpp
+		ipoib_stat.cpp \
+		ipoib_debug.cpp
 
-INCLUDES=..;..\..\..\inc;..\..\..\inc\kernel;
+INCLUDES=..;..\..\..\inc;..\..\..\inc\kernel;$(SDK_INC_PATH);
 
 C_DEFINES=$(C_DEFINES) -DNDIS_MINIPORT_DRIVER -DNDIS_WDM=1 \
-	-DDEPRECATE_DDK_FUNCTIONS -DNDIS61_MINIPORT=1 -DNEED_CL_OBJ -DBINARY_COMPATIBLE=0
+	-DDEPRECATE_DDK_FUNCTIONS -DNDIS61_MINIPORT=1 -DNEED_CL_OBJ \
+	-DBINARY_COMPATIBLE=0 -DIPOIB_CM=1 -D_PORT_REFS=0 \
+	-DUD_NBL_IN_DESC=1 -DNBL_TIMES=0 \
+	-DNDIS_HINTS=1 \
+	-DFORCE_CM_MODE=0
+
+#	-DPERF_TRACK_ON=1
+
+
+# UD_NBL_IN_DESC==1 NBL & MDL static alloc/dealloc with ipoib_recv_desc_t
+#				==0 dynamic alloc/dealloc in recv path (slower)
+# NDIS_HINTS==1 NBL/NB recv hints for packet type: NdisSetNblFlags() .
+#			==0 no hints
 
 TARGETLIBS= \
 	$(TARGETPATH)\*\complib.lib \
+	$(TARGETPATH)\*\ibal.lib \
 	$(DDK_LIB_PATH)\ndis.lib \
 	$(DDK_LIB_PATH)\ntstrsafe.lib \
 	$(DDK_LIB_PATH)\strsafe.lib
 
-!if !defined(DDK_TARGET_OS) || "$(DDK_TARGET_OS)"=="Win2K"
-#
-# The driver is built in the Win2K build environment
-# - use the library version of safe strings 
-#
-#TARGETLIBS= $(TARGETLIBS) $(DDK_LIB_PATH)\ntstrsafe.lib
-!endif
 
 !IFDEF ENABLE_EVENT_TRACING
 
@@ -55,10 +61,8 @@
 	-func:IPOIB_PRINT_EXIT(LEVEL,FLAGS,(MSG,...))
 !ENDIF
 
-
 PRECOMPILED_INCLUDE=Precompile.h
 PRECOMPILED_PCH=Precompile.pch
 PRECOMPILED_CXX=1
-
 
 MSC_WARNING_LEVEL= /W4