From 9c7cc0a26f65ddbc9ec21e3d2e754eefd94ed819 Mon Sep 17 00:00:00 2001
From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Fri, 29 Aug 2008 22:53:16 +0000
Subject: [PATCH] [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
---
 branches/WOF2-0/trunk/BuildRelease.bat        | 22 +++++++++++--------
 .../trunk/ulp/ipoib/kernel/ipoib_port.h       |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/branches/WOF2-0/trunk/BuildRelease.bat b/branches/WOF2-0/trunk/BuildRelease.bat
index edb87307..a8e97de3 100644
--- a/branches/WOF2-0/trunk/BuildRelease.bat
+++ b/branches/WOF2-0/trunk/BuildRelease.bat
@@ -81,25 +81,27 @@ if "%1" == "clean" (
     exit /B 0
 )
 
+rem Driver Signing Certificate filename, assumes %WIX%\%CERTNAME% is valid.
 rem set CERTNAME=noCert
-set CERTNAME=cse1CStore
+set CERTNAME=WinOF_Software_Pub.pfx
+set CERTPWD=WinOF
 
 rem A Digital driver signing certificate store name may be required.
 if "%1" == "all" (
-    if "%CERTNAME%" == "noCert" set /P CERTNAME=[Enter Certificate Store Name] 
+    if "%CERTNAME%" == "noCert" set /P CERTNAME=[Enter Certificate FileName] 
     if "%CERTNAME%" == "" (
         echo %0
-        echo %0: Err - driver signing certificate store name required.
+        echo %0: Err - driver signing certificate filename required.
         echo %0: see certmgr.exe
         exit /B 1
     )
 )
 
 if "%1" == "msi" (
-    if "%CERTNAME%" == "noCert" set /P CERTNAME=[Enter Certificate Store Name] 
+    if "%CERTNAME%" == "noCert" set /P CERTNAME=[Enter Certificate FileName] 
     if "%CERTNAME%" == "" (
         echo %0
-        echo %0: Err - driver signing certificate store name required.
+        echo %0: Err - driver signing certificate filename required.
         echo %0: see certmgr.exe
         exit /B 1
     )
@@ -125,7 +127,9 @@ set LBL=_R2.0
 
 rem assumes %CD% == '...\gen1\trunk'
 set BSE=%CD%
-set WIX=%CD:trunk=Branches\WinOF\WIX%
+set WIX=%CD:trunk=branches\WinOF\WIX%
+rem set WIX_BIN=wix-2.0.5325.0-binaries
+set WIX_BIN=wix-2.0.5805.0-binaries
 
 set RBIN_WLH=%WIX%\wlh\bin%
 set RBIN_WNET=%WIX%\wnet\bin%
@@ -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
 rem   ..\branches\WinOF\WIX\WIX_tools\
 rem
-if NOT EXIST %WIX%\WIX_tools\wix-2.0.5325.0-binaries (
-    echo %0 - Missing WIX tools @ %WIX%\WIX_tools 
+if NOT EXIST %WIX%\WIX_tools\%WIX_BIN% (
+    echo %0 - Missing WIX tools @ %WIX%\WIX_tools\%WIX_BIN% 
     exit /B 1
 )
 
@@ -373,7 +377,7 @@ echo     %RBIN_WXP%
 
 rem build WIX installers --> see ..\branches\WinOF\WIX
 
-%COMSPEC% /V:on /E:on /C "%_DDK%\bin\setenv.bat %_DDK% fre X64 WNET & cd /D %WIX% & build-all-MSI %CERTNAME% %IDIR%"
+%COMSPEC% /V:on /E:on /C "%_DDK%\bin\setenv.bat %_DDK% fre X64 WNET & cd /D %WIX% & build-all-MSI %CERTNAME% %CERTPWD% %IDIR%"
 
 
 :finito
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 4c8d6a22..8110fe17 100644
--- 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 @@
 
 
 /* Max send data segment list size. */
-#define MAX_SEND_SGE	30 //TODO optimize this value
+#define MAX_SEND_SGE	16 //TODO optimize this value
 
 
 /* 
-- 
2.46.0