refresh

diff --git a/meta b/meta
index d31be4e12eb7ed6eef700ede80eee1c8d46b8bbd..f4f71061ae19ed21656317f114d0142c2167fc7c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: e721993bf3c6ff0173ec28fd5a7e4370b1698366
-Head: 73e770a2715e9defc6564643d7810a86a528afe1
+Previous: 21f0a43090bb849e6e15e79826dcef54f748a35b
+Head: 320986faa492c17e8858885798b9da8afaad7551
 Applied:
-  dsocket: 017c83e85700bb3411fe7abd46eeeae229ac6012
-  refresh-temp: 73e770a2715e9defc6564643d7810a86a528afe1
+  dsocket: 320986faa492c17e8858885798b9da8afaad7551
 Unapplied:
   udpong: 87e18a2dc15e31fa2ef06b729a0142c1c7354e4a
   test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7

diff --git a/patches/dsocket b/patches/dsocket
index e435f2237644ccab3be4ab89702eb998bfcaa400..329b44c4d8abcccaaa757ce414bee8ba4b8c9e2a 100644 (file)
--- a/patches/dsocket
+++ b/patches/dsocket
@@ -1,5 +1,5 @@
 Bottom: 1fa07c62817ac4b6cb8d9c5e327ea2cdc75dbd21
-Top:    a927494883404a78f78c17da5df3f0065d13f8cb
+Top:    d58bea7ff66215f5a1631dca9de9254822217783
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-11-09 10:26:38 -0800
 
@@ -112,7 +112,7 @@ index 0a0370e..7135a61 100644
  {
        errno = err;
 diff --git a/src/rsocket.c b/src/rsocket.c
-index a060f66..f35abeb 100644
+index a060f66..024c634 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -47,6 +47,8 @@
@@ -942,7 +942,7 @@ index a060f66..f35abeb 100644
                goto err;
  
 -      ret = rs_insert(new_rs);
-+      ret = rs_insert(new_rs, rs->cm_id->channel->fd);
++      ret = rs_insert(new_rs, new_rs->cm_id->channel->fd);
        if (ret < 0)
                goto err;
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 298a4aa..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: a927494883404a78f78c17da5df3f0065d13f8cb
-Top:    d58bea7ff66215f5a1631dca9de9254822217783
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-12-07 17:08:04 -0800
-
-Refresh of dsocket
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index f35abeb..024c634 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1119,7 +1119,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
-       if (ret)
-               goto err;
- 
--      ret = rs_insert(new_rs, rs->cm_id->channel->fd);
-+      ret = rs_insert(new_rs, new_rs->cm_id->channel->fd);
-       if (ret < 0)
-               goto err;