[IPOIB/IPOIB_NDIS6_CM] install 32-bit version of ND winverbs provider in syswow64...

updated netipoib-xp32.inf also to minimize diffs such that XP specific changes can easily be identified.
This patch is in 2.2 release and working well for MS MPI.

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

diff --git a/trunk/ulp/ipoib/kernel/netipoib-xp32.inf b/trunk/ulp/ipoib/kernel/netipoib-xp32.inf
index 907a06ae1da14a2cd8e3738d44e8df5ee4a1cf42..5b4999a1713228b613514356ece0d510de87b1a1 100644 (file)
--- a/trunk/ulp/ipoib/kernel/netipoib-xp32.inf
+++ b/trunk/ulp/ipoib/kernel/netipoib-xp32.inf
@@ -51,7 +51,7 @@ AddReg          = IpoibAddReg
 CopyFiles       = IpoibCopyFiles\r
 CopyFiles       = WsdCopyFiles\r
 CopyFiles       = NdWvCopyFiles\r
-CopyFiles       = WOW64WsdCopyFiles\r
+CopyFiles       = WOW64IA64CopyFiles\r
 \r
 [Ipoib.DDInstall.ntx86.Services]\r
 AddService = ipoib, 2, IpoibService, IpoibEventLog\r
@@ -204,9 +204,11 @@ ndinstall.exe,,,0x00000002
 [WOW64CopyFiles]\r
 ibwsd.dll,ibwsd32.dll,,0x00000002\r
 ibndprov.dll,ibndprov32.dll,,0x00000002\r
+wvndprov.dll,wvndprov32.dll,,0x00000002\r
 \r
-[WOW64WsdCopyFiles]\r
+[WOW64IA64CopyFiles]\r
 ibwsd.dll,ibwsd32.dll,,0x00000002\r
+wvndprov.dll,wvndprov32.dll,,0x00000002\r
 \r
 [SourceDisksNames.x86]\r
 1 = %IcsDisk1%,,,""\r
@@ -230,6 +232,7 @@ ibwsd32.dll = 1
 ibndprov.dll = 1\r
 ibndprov32.dll = 1\r
 wvndprov.dll = 1\r
+wvndprov32.dll = 1\r
 ndinstall.exe = 1\r
 \r
 [SourceDisksFiles.ia64]\r
@@ -237,6 +240,7 @@ ipoib.sys = 1
 ibwsd.dll = 1\r
 ibwsd32.dll = 1\r
 wvndprov.dll = 1\r
+wvndprov32.dll = 1\r
 ndinstall.exe = 1\r
 \r
 [DestinationDirs]\r
@@ -245,7 +249,7 @@ WsdCopyFiles      = %DIRID_SYSTEM%
 NdCopyFiles       = %DIRID_SYSTEM%\r
 NdWvCopyFiles     = %DIRID_SYSTEM%\r
 WOW64CopyFiles    = %DIRID_SYSTEM_X86%\r
-WOW64WsdCopyFiles = %DIRID_SYSTEM_X86%\r
+WOW64IA64CopyFiles = %DIRID_SYSTEM_X86%\r
 DefaultDestDir    = %DIRID_SYSTEM%\r
 \r
 [Strings]\r
@@ -277,4 +281,4 @@ BC_JOIN_RETRY_STR   = "Number of retries connecting to bc"
 ENABLED_IF_STR         = "Enabled (if supported by HW)"\r
 ENABLED_STR            = "Enabled"\r
 DISABLED_STR           = "Disabled"\r
-BYPASS_STR             = "Bypass"
\ No newline at end of file
+BYPASS_STR             = "Bypass"\r

diff --git a/trunk/ulp/ipoib/kernel/netipoib.inx b/trunk/ulp/ipoib/kernel/netipoib.inx
index 5fc01f3b1f85493821d20357f1190fc8671d2906..ada7722555435c6f43b2c52376d62815c53dc15e 100644 (file)
--- a/trunk/ulp/ipoib/kernel/netipoib.inx
+++ b/trunk/ulp/ipoib/kernel/netipoib.inx
@@ -52,7 +52,7 @@ AddReg          = IpoibAddReg
 CopyFiles       = IpoibCopyFiles\r
 CopyFiles       = WsdCopyFiles\r
 CopyFiles       = NdWvCopyFiles\r
-CopyFiles       = WOW64WsdCopyFiles\r
+CopyFiles       = WOW64IA64CopyFiles\r
 \r
 [Ipoib.DDInstall.ntx86.Services]\r
 AddService = ipoib, 2, IpoibService, IpoibEventLog\r
@@ -205,9 +205,11 @@ ndinstall.exe,,,0x00000002
 [WOW64CopyFiles]\r
 ibwsd.dll,ibwsd32.dll,,0x00000002\r
 ibndprov.dll,ibndprov32.dll,,0x00000002\r
+wvndprov.dll,wvndprov32.dll,,0x00000002\r
 \r
-[WOW64WsdCopyFiles]\r
+[WOW64IA64CopyFiles]\r
 ibwsd.dll,ibwsd32.dll,,0x00000002\r
+wvndprov.dll,wvndprov32.dll,,0x00000002\r
 \r
 [SourceDisksNames.x86]\r
 1 = %IcsDisk1%,,,""\r
@@ -232,6 +234,7 @@ ibwsd32.dll = 1
 ibndprov.dll = 1\r
 ibndprov32.dll = 1\r
 wvndprov.dll = 1\r
+wvndprov32.dll = 1\r
 ndinstall.exe = 1\r
 \r
 [SourceDisksFiles.ia64]\r
@@ -239,6 +242,7 @@ ipoib.sys = 1
 ibwsd.dll = 1\r
 ibwsd32.dll = 1\r
 wvndprov.dll = 1\r
+wvndprov32.dll = 1\r
 ndinstall.exe = 1\r
 \r
 [DestinationDirs]\r
@@ -247,7 +251,7 @@ WsdCopyFiles      = %DIRID_SYSTEM%
 NdCopyFiles       = %DIRID_SYSTEM%\r
 NdWvCopyFiles     = %DIRID_SYSTEM%\r
 WOW64CopyFiles    = %DIRID_SYSTEM_X86%\r
-WOW64WsdCopyFiles = %DIRID_SYSTEM_X86%\r
+WOW64IA64CopyFiles = %DIRID_SYSTEM_X86%\r
 DefaultDestDir    = %DIRID_SYSTEM%\r
 \r
 [Strings]\r
@@ -279,4 +283,4 @@ BC_JOIN_RETRY_STR   = "Number of retries connecting to bc"
 ENABLED_IF_STR         = "Enabled (if supported by HW)"\r
 ENABLED_STR            = "Enabled"\r
 DISABLED_STR           = "Disabled"\r
-BYPASS_STR             = "Bypass"
\ No newline at end of file
+BYPASS_STR             = "Bypass"\r

diff --git a/trunk/ulp/ipoib_NDIS6_CM/kernel/netipoib.inx b/trunk/ulp/ipoib_NDIS6_CM/kernel/netipoib.inx
index f475dee72ce3988e151c129012d0c056714af7f5..daefdc296190888b5d29f7fe36f1e9c0459bad76 100644 (file)
--- a/trunk/ulp/ipoib_NDIS6_CM/kernel/netipoib.inx
+++ b/trunk/ulp/ipoib_NDIS6_CM/kernel/netipoib.inx
@@ -58,7 +58,7 @@ AddReg          = IpoibAddReg
 CopyFiles       = IpoibCopyFiles\r
 CopyFiles       = WsdCopyFiles\r
 CopyFiles       = NdWvCopyFiles\r
-CopyFiles       = WOW64WsdCopyFiles\r
+CopyFiles       = WOW64IA64CopyFiles\r
 *IfType         = 6            ; IF_TYPE_ETHERNET_CSMACD \r
 *MediaType      = 0            ; NdisMedium802_3\r
 *PhysicalMediaType = 14                ; NdisPhysicalMedium802_3\r
@@ -226,9 +226,11 @@ ndinstall.exe,,,0x00000002
 [WOW64CopyFiles]\r
 ibwsd.dll,ibwsd32.dll,,0x00000002\r
 ibndprov.dll,ibndprov32.dll,,0x00000002\r
+wvndprov.dll,wvndprov32.dll,,0x00000002\r
 \r
-[WOW64WsdCopyFiles]\r
+[WOW64IA64CopyFiles]\r
 ibwsd.dll,ibwsd32.dll,,0x00000002\r
+wvndprov.dll,wvndprov32.dll,,0x00000002\r
 \r
 [SourceDisksNames.x86]\r
 1 = %IcsDisk1%,,,""\r
@@ -253,6 +255,7 @@ ibwsd32.dll = 1
 ibndprov.dll = 1\r
 ibndprov32.dll = 1\r
 wvndprov.dll = 1\r
+wvndprov32.dll = 1\r
 ndinstall.exe = 1\r
 \r
 [SourceDisksFiles.ia64]\r
@@ -260,6 +263,7 @@ ipoib.sys = 1
 ibwsd.dll = 1\r
 ibwsd32.dll = 1\r
 wvndprov.dll = 1\r
+wvndprov32.dll = 1\r
 ndinstall.exe = 1\r
 \r
 [DestinationDirs]\r
@@ -268,7 +272,7 @@ WsdCopyFiles      = %DIRID_SYSTEM%
 NdCopyFiles       = %DIRID_SYSTEM%\r
 NdWvCopyFiles     = %DIRID_SYSTEM%\r
 WOW64CopyFiles    = %DIRID_SYSTEM_X86%\r
-WOW64WsdCopyFiles = %DIRID_SYSTEM_X86%\r
+WOW64IA64CopyFiles = %DIRID_SYSTEM_X86%\r
 DefaultDestDir    = %DIRID_SYSTEM%\r
 \r
 [Strings]\r
@@ -302,4 +306,4 @@ ENABLED_STR         = "Enabled"
 DISABLED_STR           = "Disabled"\r
 BYPASS_STR             = "Bypass"\r
 CONNECTED_MODE_STR     = "Connected mode"\r
-CONNECTED_MODE_MTU_STR = "Connected Mode Payload Mtu size"
\ No newline at end of file
+CONNECTED_MODE_MTU_STR = "Connected Mode Payload Mtu size"\r