[WinOF]

buildrelease.bat now uses a .pfx file for 'OpenFabrics Alliance' driver signing.

[IPOIB]
ipoib_port.h MAX_SEND_SGE was boosted from 8 (svn.1498) to 30 in svn.1499 with only x64 testing. Result was x86 and ia64 ipoib has been broken since svn.1499. IPoIB could not create a UD QP with 30 SGE entries for x86 & ia64 (mthca). I temp set MAX_SEND_SGE == 16 which works for all supported arches.

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

diff --git a/branches/WOF2-0/trunk/BuildRelease.bat b/branches/WOF2-0/trunk/BuildRelease.bat
index edb873079c290f101a931cf8374499833056a52f..a8e97de3ed8a408baabd5c93b72fc15174d5a965 100644 (file)
--- a/branches/WOF2-0/trunk/BuildRelease.bat
+++ b/branches/WOF2-0/trunk/BuildRelease.bat
@@ -81,25 +81,27 @@ if "%1" == "clean" (
     exit /B 0\r
 )\r
 \r
+rem Driver Signing Certificate filename, assumes %WIX%\%CERTNAME% is valid.\r
 rem set CERTNAME=noCert\r
-set CERTNAME=cse1CStore\r
+set CERTNAME=WinOF_Software_Pub.pfx\r
+set CERTPWD=WinOF\r
 \r
 rem A Digital driver signing certificate store name may be required.\r
 if "%1" == "all" (\r
-    if "%CERTNAME%" == "noCert" set /P CERTNAME=[Enter Certificate Store Name] \r
+    if "%CERTNAME%" == "noCert" set /P CERTNAME=[Enter Certificate FileName] \r
     if "%CERTNAME%" == "" (\r
         echo %0\r
-        echo %0: Err - driver signing certificate store name required.\r
+        echo %0: Err - driver signing certificate filename required.\r
         echo %0: see certmgr.exe\r
         exit /B 1\r
     )\r
 )\r
 \r
 if "%1" == "msi" (\r
-    if "%CERTNAME%" == "noCert" set /P CERTNAME=[Enter Certificate Store Name] \r
+    if "%CERTNAME%" == "noCert" set /P CERTNAME=[Enter Certificate FileName] \r
     if "%CERTNAME%" == "" (\r
         echo %0\r
-        echo %0: Err - driver signing certificate store name required.\r
+        echo %0: Err - driver signing certificate filename required.\r
         echo %0: see certmgr.exe\r
         exit /B 1\r
     )\r
@@ -125,7 +127,9 @@ set LBL=_R2.0
 \r
 rem assumes %CD% == '...\gen1\trunk'\r
 set BSE=%CD%\r
-set WIX=%CD:trunk=Branches\WinOF\WIX%\r
+set WIX=%CD:trunk=branches\WinOF\WIX%\r
+rem set WIX_BIN=wix-2.0.5325.0-binaries\r
+set WIX_BIN=wix-2.0.5805.0-binaries\r
 \r
 set RBIN_WLH=%WIX%\wlh\bin%\r
 set RBIN_WNET=%WIX%\wnet\bin%\r
@@ -224,8 +228,8 @@ rem http://sourceforge.net/project/showfiles.php?group_id=105970&package_id=1141
 rem   select wix-2.0.5325.0-binaries.zip download and unzip to\r
 rem   ..\branches\WinOF\WIX\WIX_tools\\r
 rem\r
-if NOT EXIST %WIX%\WIX_tools\wix-2.0.5325.0-binaries (\r
-    echo %0 - Missing WIX tools @ %WIX%\WIX_tools \r
+if NOT EXIST %WIX%\WIX_tools\%WIX_BIN% (\r
+    echo %0 - Missing WIX tools @ %WIX%\WIX_tools\%WIX_BIN% \r
     exit /B 1\r
 )\r
 \r
@@ -373,7 +377,7 @@ echo     %RBIN_WXP%
 \r
 rem build WIX installers --> see ..\branches\WinOF\WIX\r
 \r
-%COMSPEC% /V:on /E:on /C "%_DDK%\bin\setenv.bat %_DDK% fre X64 WNET & cd /D %WIX% & build-all-MSI %CERTNAME% %IDIR%"\r
+%COMSPEC% /V:on /E:on /C "%_DDK%\bin\setenv.bat %_DDK% fre X64 WNET & cd /D %WIX% & build-all-MSI %CERTNAME% %CERTPWD% %IDIR%"\r
 \r
 \r
 :finito\r

diff --git a/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_port.h b/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_port.h
index 4c8d6a2283819e88a6095554e337c25c9c186152..8110fe17b8164325af612fcbf13a9ad71a46ef93 100644 (file)
--- a/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_port.h
+++ b/branches/WOF2-0/trunk/ulp/ipoib/kernel/ipoib_port.h
@@ -53,7 +53,7 @@
 \r
 \r
 /* Max send data segment list size. */\r
-#define MAX_SEND_SGE   30 //TODO optimize this value\r
+#define MAX_SEND_SGE   16 //TODO optimize this value\r
 \r
 \r
 /* \r