diff options
author | Andy Grover <andy.grover@oracle.com> | 2010-02-03 22:36:44 -0500 |
---|---|---|
committer | Andy Grover <andy.grover@oracle.com> | 2010-09-08 21:12:01 -0400 |
commit | 5b2366bd2835919e2e6a836e837eab4a9274bd46 (patch) | |
tree | ee0be5166dfec4acc006a23ddc9ea5788dbb90ea /net/rds/rds.h | |
parent | 6c7cc6e4694dc464ae884332f2a322973497e3cf (diff) |
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.h | 5 |
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 { | |||
96 | unsigned long c_xmit_sg; | 96 | unsigned long c_xmit_sg; |
97 | unsigned int c_xmit_hdr_off; | 97 | unsigned int c_xmit_hdr_off; |
98 | unsigned int c_xmit_data_off; | 98 | unsigned int c_xmit_data_off; |
99 | unsigned int c_xmit_rdma_sent; | ||
100 | unsigned int c_xmit_atomic_sent; | 99 | unsigned int c_xmit_atomic_sent; |
100 | unsigned int c_xmit_rdma_sent; | ||
101 | unsigned int c_xmit_data_sent; | ||
101 | 102 | ||
102 | spinlock_t c_lock; /* protect msg queues */ | 103 | spinlock_t c_lock; /* protect msg queues */ |
103 | u64 c_next_tx_seq; | 104 | u64 c_next_tx_seq; |
@@ -120,8 +121,6 @@ struct rds_connection { | |||
120 | 121 | ||
121 | struct list_head c_map_item; | 122 | struct list_head c_map_item; |
122 | unsigned long c_map_queued; | 123 | unsigned long c_map_queued; |
123 | unsigned long c_map_offset; | ||
124 | unsigned long c_map_bytes; | ||
125 | 124 | ||
126 | unsigned int c_unacked_packets; | 125 | unsigned int c_unacked_packets; |
127 | unsigned int c_unacked_bytes; | 126 | unsigned int c_unacked_bytes; |