delete

diff --git a/meta b/meta
index c5872487120b6ef9ed3919595fb768f19157adc3..014a2b7515cf0f74b9e9008d72e5ee1897eb00cc 100644 (file)
--- a/meta
+++ b/meta
@@ -1,5 +1,5 @@
 Version: 1
-Previous: 6b65f4b2e13fa8248b9a20712264c56fdef7486f
+Previous: 60f1bb7a2de71a66ed7883f529cbe75961b99941
 Head: 5a39fae0e595b08ff2b5ca58896ee0ecd51ab66c
 Applied:
   rs-shutdown: 110fcad2ecce39d6888448c19b08791ea193e7f9
@@ -8,6 +8,5 @@ Applied:
   rs-defaults: 5a39fae0e595b08ff2b5ca58896ee0ecd51ab66c
 Unapplied:
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941
-  buf-addr: eb70620389ced3c0c705d44b69e691a47cd3e4fd
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
 Hidden:

diff --git a/patches/buf-addr b/patches/buf-addr
deleted file mode 100644 (file)
index e11b959..0000000
--- a/patches/buf-addr
+++ /dev/null
@@ -1,34 +0,0 @@
-Bottom: d79d5464622c07a1ee7c42051fee5fca02c52207
-Top:    df4a104300fda6912a1a9fe31d7d35050f32e0cd
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-01 16:31:00 -0700
-
-print buffer addresses
-
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 48e2771..b2560e1 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -531,6 +531,7 @@ static int run(void)
-               perror("malloc");
-               return -1;
-       }
-+printf("rstream buf %p\n", buf);
- 
-       if (!dst_addr) {
-               ret = server_listen();
-diff --git a/src/rsocket.c b/src/rsocket.c
-index c111797..2e460df 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -305,6 +305,7 @@ static int rs_init_bufs(struct rsocket *rs)
-       rs->rbuf = calloc(rs->rbuf_size, sizeof(*rs->rbuf));
-       if (!rs->rbuf)
-               return -1;
-+printf("rsocket sbuf %p rbuf %p\n", rs->sbuf, rs->rbuf);
- 
-       rs->rmr = rdma_reg_write(rs->cm_id, rs->rbuf, rs->rbuf_size);
-       if (!rs->rmr)