Version: 1
-Previous: eecfbcc964ce5223d802e5eea18c8b3564d557a1
-Head: ad3be3a08de1c984c85f2f44d953894f30d279f6
+Previous: 603b52016b4c0417d17ba16b28f2fb228862b144
+Head: 2b744849213f057983fe1a297b924cd5461abd87
Applied:
dsocket: ad3be3a08de1c984c85f2f44d953894f30d279f6
+ refresh-temp: 2b744849213f057983fe1a297b924cd5461abd87
Unapplied:
udpong: 87e18a2dc15e31fa2ef06b729a0142c1c7354e4a
test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7
--- /dev/null
+Bottom: ae4df7b46b3d1c519383a31cb018c70f3e4e8201
+Top: a927494883404a78f78c17da5df3f0065d13f8cb
+Author: Sean Hefty <sean.hefty@intel.com>
+Date: 2012-12-07 17:01:27 -0800
+
+Refresh of dsocket
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 9996d33..f35abeb 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -554,8 +554,10 @@ static struct rsocket *rs_alloc(struct rsocket *inherited_rs, int type)
+
+ rs->type = type;
+ rs->index = -1;
+- rs->udp_sock = -1;
+- rs->epfd = -1;
++ if (type == SOCK_DGRAM) {
++ rs->udp_sock = -1;
++ rs->epfd = -1;
++ }
+
+ if (inherited_rs) {
+ rs->sbuf_size = inherited_rs->sbuf_size;
+@@ -563,16 +565,20 @@ static struct rsocket *rs_alloc(struct rsocket *inherited_rs, int type)
+ rs->sq_inline = inherited_rs->sq_inline;
+ rs->sq_size = inherited_rs->sq_size;
+ rs->rq_size = inherited_rs->rq_size;
+- rs->ctrl_avail = inherited_rs->ctrl_avail;
+- rs->target_iomap_size = inherited_rs->target_iomap_size;
++ if (type == SOCK_STREAM) {
++ rs->ctrl_avail = inherited_rs->ctrl_avail;
++ rs->target_iomap_size = inherited_rs->target_iomap_size;
++ }
+ } else {
+ rs->sbuf_size = def_wmem;
+ rs->rbuf_size = def_mem;
+ rs->sq_inline = def_inline;
+ rs->sq_size = def_sqsize;
+ rs->rq_size = def_rqsize;
+- rs->ctrl_avail = RS_QP_CTRL_SIZE;
+- rs->target_iomap_size = def_iomap_size;
++ if (type == SOCK_STREAM) {
++ rs->ctrl_avail = RS_QP_CTRL_SIZE;
++ rs->target_iomap_size = def_iomap_size;
++ }
+ }
+ fastlock_init(&rs->slock);
+ fastlock_init(&rs->rlock);