refresh (create temporary patch)

diff --git a/meta b/meta
index f69e7727c64c98294e368f99dee5797cca40febb..a14e37e9101e33043c09d72bdff0428d9c915cbc 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 757869b2addfc7b87076b0d87249613d1ef0b05e
-Head: 096a4c37a98b2c1bc46e0661ef8604f7a3a7ddc9
+Previous: a7cf9130eac4cf3a715eb489ae9dccd64d9d3635
+Head: 5a3cf4ee1c43133036b17b8793fb7ab303a1e1a9
 Applied:
   dsocket: 096a4c37a98b2c1bc46e0661ef8604f7a3a7ddc9
+  refresh-temp: 5a3cf4ee1c43133036b17b8793fb7ab303a1e1a9
 Unapplied:
   udpong: ecf6d20467feb7aec39bcf77bfc8795186290eb1
   test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..b0947c2
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,35 @@
+Bottom: a51fe46dbaa58743e3254a4ef2288b4490ff5d13
+Top:    719db85186f7ed857546278db44ac37a1e6e8dee
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-12-19 15:22:08 -0800
+
+Refresh of dsocket
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 954e42b..0111836 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -714,9 +714,11 @@ static int rs_create_cq(struct rsocket *rs, struct rdma_cm_id *cm_id)
+       if (rs->fd_flags & O_NONBLOCK) {
+               if (fcntl(cm_id->recv_cq_channel->fd, F_SETFL, O_NONBLOCK))
+                       goto err2;
+-      } else {
+-              ibv_req_notify_cq(cm_id->recv_cq, 0);
+       }
++      //***
++      //else {
++              ibv_req_notify_cq(cm_id->recv_cq, 0);
++      //}
+ 
+       cm_id->send_cq_channel = cm_id->recv_cq_channel;
+       cm_id->send_cq = cm_id->recv_cq;
+@@ -2872,7 +2874,7 @@ int rpoll(struct pollfd *fds, nfds_t nfds, int timeout)
+               if (ret)
+                       break;
+ 
+-              ret = poll(rfds, nfds, timeout ? 10000 : 0);
++              ret = poll(rfds, nfds, timeout);
+               if (ret <= 0)
+                       break;