diff options
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 270ded76fd53..4510344ce8ca 100644 --- a/net/rds/rds.h +++ b/net/rds/rds.h | |||
@@ -80,6 +80,7 @@ enum { | |||
80 | /* Bits for c_flags */ | 80 | /* Bits for c_flags */ |
81 | #define RDS_LL_SEND_FULL 0 | 81 | #define RDS_LL_SEND_FULL 0 |
82 | #define RDS_RECONNECT_PENDING 1 | 82 | #define RDS_RECONNECT_PENDING 1 |
83 | #define RDS_IN_XMIT 2 | ||
83 | 84 | ||
84 | struct rds_connection { | 85 | struct rds_connection { |
85 | struct hlist_node c_hash_node; | 86 | struct hlist_node c_hash_node; |
@@ -91,9 +92,6 @@ struct rds_connection { | |||
91 | struct rds_cong_map *c_lcong; | 92 | struct rds_cong_map *c_lcong; |
92 | struct rds_cong_map *c_fcong; | 93 | struct rds_cong_map *c_fcong; |
93 | 94 | ||
94 | spinlock_t c_send_lock; /* protect send ring */ | ||
95 | atomic_t c_send_generation; | ||
96 | atomic_t c_senders; | ||
97 | struct rds_message *c_xmit_rm; | 95 | struct rds_message *c_xmit_rm; |
98 | unsigned long c_xmit_sg; | 96 | unsigned long c_xmit_sg; |
99 | unsigned int c_xmit_hdr_off; | 97 | unsigned int c_xmit_hdr_off; |
@@ -120,6 +118,7 @@ struct rds_connection { | |||
120 | struct delayed_work c_conn_w; | 118 | struct delayed_work c_conn_w; |
121 | struct work_struct c_down_w; | 119 | struct work_struct c_down_w; |
122 | struct mutex c_cm_lock; /* protect conn state & cm */ | 120 | struct mutex c_cm_lock; /* protect conn state & cm */ |
121 | wait_queue_head_t c_waitq; | ||
123 | 122 | ||
124 | struct list_head c_map_item; | 123 | struct list_head c_map_item; |
125 | unsigned long c_map_queued; | 124 | unsigned long c_map_queued; |