refresh

diff --git a/meta b/meta
index 9871c04c2b7780f8225d95c1e34de7f4be40dde6..3cb26521f6a2e8711c7ef6170338457704e50061 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: fada058dcf59b946c530552d01cad975a0955e4b
-Head: 184b986f0ce9c5dccb56e798359eff050b0fde18
+Previous: ade05a0fdbf65c85c048274e4ec0fccf3c1b94b4
+Head: 70f2e5779fba924958bf02008a052f41ffcc25f5
 Applied:
-  typecast: e0bec7efad536b2f238a6a23bbc368a8ac1cecc0
-  refresh-temp-0: 184b986f0ce9c5dccb56e798359eff050b0fde18
+  typecast: 70f2e5779fba924958bf02008a052f41ffcc25f5
 Unapplied:
   v1-0-16: 18a001ac3215de7a860231007aa2d57058ed1735
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/refresh-temp-0 b/patches/refresh-temp-0
deleted file mode 100644 (file)
index 1538288..0000000
--- a/patches/refresh-temp-0
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: b0d26700067fa09254ee8df365690f91fd2ac5fb
-Top:    d90f6a06ceeb5ffd6ef8cc2c97fe0494dcd7f238
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-12 09:24:59 -0700
-
-Refresh of typecast
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 8758d5c..2750b30 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -347,7 +347,7 @@ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
-       int fd, ret;
- 
-       if (fd_get(socket, &fd) == fd_rsocket) {
--              sin = (struct sockaddr_sin *) addr;
-+              sin = (struct sockaddr_in *) addr;
-               if (!sin->sin_port || ntohs(sin->sin_port) > 1024)
-                       return rbind(fd, addr, addrlen);
- 
-@@ -394,7 +394,7 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
-       int fd, ret;
- 
-       if (fd_get(socket, &fd) == fd_rsocket) {
--              sin = (struct sockaddr_sin *) addr;
-+              sin = (struct sockaddr_in *) addr;
-               if (ntohs(sin->sin_port) > 1024) {
-                       ret = rconnect(fd, addr, addrlen);
-                       if (!ret || errno == EINPROGRESS)

diff --git a/patches/typecast b/patches/typecast
index 38ba4a4eee89cfc1ad0f0d92e9dbdaca884bcee2..e065863aacc9d949cedcaa38e53e14af1d1b2e1f 100644 (file)
--- a/patches/typecast
+++ b/patches/typecast
@@ -1,5 +1,5 @@
 Bottom: b0d26700067fa09254ee8df365690f91fd2ac5fb
-Top:    b0d26700067fa09254ee8df365690f91fd2ac5fb
+Top:    d90f6a06ceeb5ffd6ef8cc2c97fe0494dcd7f238
 Author: Hal Rosenstock <hal@mellanox.com>
 Date:   2012-07-12 09:24:10 -0700
 
@@ -16,4 +16,25 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/preload.c b/src/preload.c
+index 8758d5c..2750b30 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -347,7 +347,7 @@ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
+       int fd, ret;
+ 
+       if (fd_get(socket, &fd) == fd_rsocket) {
+-              sin = (struct sockaddr_sin *) addr;
++              sin = (struct sockaddr_in *) addr;
+               if (!sin->sin_port || ntohs(sin->sin_port) > 1024)
+                       return rbind(fd, addr, addrlen);
+ 
+@@ -394,7 +394,7 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+       int fd, ret;
+ 
+       if (fd_get(socket, &fd) == fd_rsocket) {
+-              sin = (struct sockaddr_sin *) addr;
++              sin = (struct sockaddr_in *) addr;
+               if (ntohs(sin->sin_port) > 1024) {
+                       ret = rconnect(fd, addr, addrlen);
+                       if (!ret || errno == EINPROGRESS)