1 files changed, 3 insertions, 7 deletions

diff --git a/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h b/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h
index 8e3429027b..28bddd2165 100644
--- a/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h
+++ b/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h
@@ -57,9 +57,8 @@ namespace Rdma {
         void dataCount(int32_t);
 
     private:
-        Buffer(uint32_t lkey, char* bytes, const int32_t byteCount, const int32_t reserve=0);
+        Buffer(uint32_t lkey, char* bytes, const int32_t byteCount);
         int32_t bufferSize;
-        int32_t reserved;   // for framing header
         ::ibv_sge sge;
     };
 
@@ -67,9 +66,8 @@ namespace Rdma {
       return (char*) sge.addr;
     }
 
-    /** return the number of bytes available for application data */
     inline int32_t Buffer::byteCount() const {
-        return bufferSize - reserved;
+        return bufferSize;
     }
 
     inline int32_t Buffer::dataCount() const {
@@ -77,8 +75,6 @@ namespace Rdma {
     }
 
     inline void Buffer::dataCount(int32_t s) {
-        // catch any attempt to overflow a buffer
-        assert(s <= bufferSize + reserved);
         sge.length = s;
     }
 
@@ -140,7 +136,7 @@ namespace Rdma {
         typedef boost::intrusive_ptr<QueuePair> intrusive_ptr;
 
         // Create a buffers to use for writing
-        void createSendBuffers(int sendBufferCount, int dataSize, int headerSize);
+        void createSendBuffers(int sendBufferCount, int bufferSize);
 
         // Get a send buffer
         Buffer* getSendBuffer();