rename

diff --git a/meta b/meta
index af7f0916b8babcaddea58868d4d960bbef5ef973..0e78a29c195892548daef216be2a69a1f1a215b8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,5 +1,5 @@
 Version: 1
-Previous: 4f432bb26d7636bf00cd0897c2370a53edceba0e
+Previous: 8962ad58d30ef98d6683bb02ef3f06e837c7809c
 Head: 8d7ff5ef8dd0af977baac97976103a7494c2f3e0
 Applied:
   ex-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
@@ -21,6 +21,6 @@ Unapplied:
   af-ib-conn: cf7b9e73d471477d4c7dff2592e5b0d3a7dea8ae
   addrtype: 23a84fed89ba3f6b0eb63e5f8b37c0df504d0d3e
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
-  rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f
+  old-rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f
   old-rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
 Hidden:

diff --git a/patches/old-rs-target-sgl b/patches/old-rs-target-sgl
new file mode 100644 (file)
index 0000000..5af8fca
--- /dev/null
+++ b/patches/old-rs-target-sgl
@@ -0,0 +1,53 @@
+Bottom: 134799972a9b123f7a629b2a58b8f87a86ed1773
+Top:    27891b225174785cd2bb770ded44484cbf710c4f
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-10-20 23:43:13 -0700
+
+rsocket: Expand definition of target SGE
+
+During connection establishment, rsocket exchanges a
+target SGE.  The target SGE contains the address, rkey,
+and length of the target SGL.  The target SGL is the
+location where rsocket publishes data buffers at the
+remote peer.
+
+The length contained in the target SGE is the number of
+entries in the target SGL, which is currently set to 2.
+Divide the length field into 3 separate values.
+
+bits 31:16 - reserved
+bits 15:8  - use for direct data placement algorithm
+bits 7:0   - use for target SGL size
+
+Bits 15 and 7 are used as scaling factors.  If set, then
+the size specified in the corresponding lower bits is
+multiplied by 128.
+
+Backwards compatibility is maintained, since we never use
+a value greater than 2 anyway.
+
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
+
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 6bfbed6..fd31dfa 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -124,6 +124,15 @@ struct rs_sge {
+ #define rs_host_is_net() (1 == htonl(1))
+ #define RS_CONN_FLAG_NET 1
+ 
++/*
++ * target_sgl:
++ *    addr   - Remote address to published target buffers
++ *    key    - Rkey of remote address for RDMA writes
++ *    length - Specifies sizes of target SGL areas
++ *             bits 31:16 - reserved
++ *             bits 15:8  - number of direct data placement target entries
++ *             bits  7:0  - number of network buffer target entries
++ */
+ struct rs_conn_data {
+       uint8_t           version;
+       uint8_t           flags;

diff --git a/patches/rs-target-sgl b/patches/rs-target-sgl
deleted file mode 100644 (file)
index 5af8fca..0000000
--- a/patches/rs-target-sgl
+++ /dev/null
@@ -1,53 +0,0 @@
-Bottom: 134799972a9b123f7a629b2a58b8f87a86ed1773
-Top:    27891b225174785cd2bb770ded44484cbf710c4f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-20 23:43:13 -0700
-
-rsocket: Expand definition of target SGE
-
-During connection establishment, rsocket exchanges a
-target SGE.  The target SGE contains the address, rkey,
-and length of the target SGL.  The target SGL is the
-location where rsocket publishes data buffers at the
-remote peer.
-
-The length contained in the target SGE is the number of
-entries in the target SGL, which is currently set to 2.
-Divide the length field into 3 separate values.
-
-bits 31:16 - reserved
-bits 15:8  - use for direct data placement algorithm
-bits 7:0   - use for target SGL size
-
-Bits 15 and 7 are used as scaling factors.  If set, then
-the size specified in the corresponding lower bits is
-multiplied by 128.
-
-Backwards compatibility is maintained, since we never use
-a value greater than 2 anyway.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 6bfbed6..fd31dfa 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -124,6 +124,15 @@ struct rs_sge {
- #define rs_host_is_net() (1 == htonl(1))
- #define RS_CONN_FLAG_NET 1
- 
-+/*
-+ * target_sgl:
-+ *    addr   - Remote address to published target buffers
-+ *    key    - Rkey of remote address for RDMA writes
-+ *    length - Specifies sizes of target SGL areas
-+ *             bits 31:16 - reserved
-+ *             bits 15:8  - number of direct data placement target entries
-+ *             bits  7:0  - number of network buffer target entries
-+ */
- struct rs_conn_data {
-       uint8_t           version;
-       uint8_t           flags;