refresh

diff --git a/meta b/meta
index e4b9cc314e134267915ea4f47b2943147ee1638b..db537a5731567585794e21b9254589ede5b544cd 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 9fcffc10fff06af8c0a936e86ddf492d6236c638
-Head: 34f586815d87f947afdf0764c8ad082f75e30ae7
+Previous: 554049e4deb02a8c7019187b83c1fd2dc4cf1df8
+Head: fbed4ce5ede21048062c5b2806dae76f98632afd
 Applied:
   cm-rej: 2e7df5bd03a9ea27e8b3fc52d90a0ea4f2511753
   cm_listen_handler: 0eb17b6dce521c0b01d6500ef16a172b6948a678
   cm-poll: c6ffeae845fd89e9f560a0beb599acba2451fe26
   wvnd-inline: e15f9aa413b2982945c96b44aee3cdd46115be86
-  nd-ps: be3c37f0900a0b86899e2ac459e49a78f2c96704
-  refresh-temp: 34f586815d87f947afdf0764c8ad082f75e30ae7
+  nd-ps: fbed4ce5ede21048062c5b2806dae76f98632afd
 Unapplied:
   nd-times: 7b3cb2057aee2bf0853a0fbc89d76624ab5a10c0
   sync-test: 0fb4fbfa8b43dd13ae43922001092f6bd24811c9

diff --git a/patches/nd-ps b/patches/nd-ps
index ee5c91c673e4e9450c0e6171e383b0a0962fb0f8..6f0b2380643d50bcd04b37b45f308dca74e1480d 100644 (file)
--- a/patches/nd-ps
+++ b/patches/nd-ps
@@ -1,5 +1,5 @@
 Bottom: fd582232979a59f2a71697d3149207555158af12
-Top:    fd582232979a59f2a71697d3149207555158af12
+Top:    9e975be7fb63edf138df6ccd1f7db09d6e2448fd
 Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
 Date:   2010-01-12 17:06:11 -0800
 
@@ -13,4 +13,16 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/trunk/core/winverbs/user/wv_ep.cpp b/trunk/core/winverbs/user/wv_ep.cpp
+index 28d2f7d..188542e 100644
+--- a/trunk/core/winverbs/user/wv_ep.cpp
++++ b/trunk/core/winverbs/user/wv_ep.cpp
+@@ -190,7 +190,7 @@ BindAddress(SOCKADDR* pAddress)
+               }\r
+       }\r
+ \r
+-      m_Socket = socket(pAddress->sa_family, SOCK_STREAM, IPPROTO_TCP);\r
++      m_Socket = socket(pAddress->sa_family, SOCK_DGRAM, IPPROTO_UDP);\r
+       if (m_Socket == INVALID_SOCKET) {\r
+               return WvConvertWSAStatus(WSAGetLastError());\r
+       }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a06dd90..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: fd582232979a59f2a71697d3149207555158af12
-Top:    9e975be7fb63edf138df6ccd1f7db09d6e2448fd
-Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
-Date:   2010-01-12 22:29:20 -0800
-
-Refresh of nd-ps
-
----
-
-diff --git a/trunk/core/winverbs/user/wv_ep.cpp b/trunk/core/winverbs/user/wv_ep.cpp
-index 28d2f7d..188542e 100644
---- a/trunk/core/winverbs/user/wv_ep.cpp
-+++ b/trunk/core/winverbs/user/wv_ep.cpp
-@@ -190,7 +190,7 @@ BindAddress(SOCKADDR* pAddress)
-               }\r
-       }\r
- \r
--      m_Socket = socket(pAddress->sa_family, SOCK_STREAM, IPPROTO_TCP);\r
-+      m_Socket = socket(pAddress->sa_family, SOCK_DGRAM, IPPROTO_UDP);\r
-       if (m_Socket == INVALID_SOCKET) {\r
-               return WvConvertWSAStatus(WSAGetLastError());\r
-       }