summaryrefslogtreecommitdiffstats
path: root/net/rds/rds.h
diff options
context:
space:
mode:
authorAndy Grover <andy.grover@oracle.com>2010-02-03 19:36:44 -0800
committerAndy Grover <andy.grover@oracle.com>2010-09-08 18:12:01 -0700
commit5b2366bd2835919e2e6a836e837eab4a9274bd46 (patch)
treeee0be5166dfec4acc006a23ddc9ea5788dbb90ea /net/rds/rds.h
parent6c7cc6e4694dc464ae884332f2a322973497e3cf (diff)
downloadlinux-5b2366bd2835919e2e6a836e837eab4a9274bd46.tar.gz
linux-5b2366bd2835919e2e6a836e837eab4a9274bd46.tar.bz2
linux-5b2366bd2835919e2e6a836e837eab4a9274bd46.zip
RDS: Rewrite rds_send_xmit
Simplify rds_send_xmit(). Send a congestion map (via xmit_cong_map) without decrementing send_quota. Move resetting of conn xmit variables to end of loop. Update comments. Implement a special case to turn off sending an rds header when there is an atomic op and no other data. Signed-off-by: Andy Grover <andy.grover@oracle.com>
Diffstat (limited to 'net/rds/rds.h')
-rw-r--r--net/rds/rds.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/rds/rds.h b/net/rds/rds.h
index d70284989124..13ed30ac424d 100644
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -96,8 +96,9 @@ struct rds_connection {
unsigned long c_xmit_sg;
unsigned int c_xmit_hdr_off;
unsigned int c_xmit_data_off;
- unsigned int c_xmit_rdma_sent;
unsigned int c_xmit_atomic_sent;
+ unsigned int c_xmit_rdma_sent;
+ unsigned int c_xmit_data_sent;
spinlock_t c_lock; /* protect msg queues */
u64 c_next_tx_seq;
@@ -120,8 +121,6 @@ struct rds_connection {
struct list_head c_map_item;
unsigned long c_map_queued;
- unsigned long c_map_offset;
- unsigned long c_map_bytes;
unsigned int c_unacked_packets;
unsigned int c_unacked_bytes;