Signed-off-by: Tom Duffy <[EMAIL PROTECTED]>
Index: linux-2.6.10-openib/drivers/infiniband/ulp/sdp/sdp_proto.h
===================================================================
--- linux-2.6.10-openib/drivers/infiniband/ulp/sdp/sdp_proto.h (revision 1836)
+++ linux-2.6.10-openib/drivers/infiniband/ulp/sdp/sdp_proto.h (working copy)
@@ -599,14 +599,10 @@ static __inline__ int __sdp_inet_write_s
if (0 < (SDP_ST_MASK_OPEN & conn->istate) &&
(conn->send_max >
sdp_desc_q_types_size(&conn->send_queue,
- SDP_DESC_TYPE_BUFF))) {
-
+ SDP_DESC_TYPE_BUFF)))
return ((SDP_INET_SEND_MARK < size || 1 < urg) ? size : 0);
- }
- else {
-
+ else
return 0;
- }
} /* __sdp_inet_write_space */
/*
@@ -616,15 +612,11 @@ static __inline__ int __sdp_inet_writabl
{
SDP_CHECK_NULL(conn, -EINVAL);
- if (0 < (SDP_ST_MASK_OPEN & conn->istate)) {
-
+ if (0 < (SDP_ST_MASK_OPEN & conn->istate))
return (__sdp_inet_write_space(conn, 0) <
(conn->send_qud / 2)) ? 0 : 1;
- }
- else {
-
+ else
return 0;
- }
} /* __sdp_inet_writable */
/*
@@ -638,17 +630,14 @@ static __inline__ int __sdp_conn_stat_du
sdp_dbg_init("STAT: src <%u> snk <%u>",
conn->src_serv, conn->snk_serv);
- for (counter = 0; counter < 0x20; counter++) {
-
+ for (counter = 0; counter < 0x20; counter++)
if (0 < conn->send_mid[counter] ||
0 < conn->recv_mid[counter]) {
-
sdp_dbg_init("STAT: MID send <%02x> <%u>", counter,
conn->send_mid[counter]);
sdp_dbg_init("STAT: MID recv <%02x> <%u>", counter,
conn->recv_mid[counter]);
}
- }
#endif
return 0;
} /* __sdp_conn_stat_dump */
@@ -666,7 +655,6 @@ static __inline__ int __sdp_conn_state_d
sdp_dbg_init("STATE: Connection <%04x> state:", conn->hashent);
if (SDP_CONN_ST_INVALID == conn->state_rec.state[0]) {
-
sdp_dbg_init("STATE: No state history. <%d>",
conn->state_rec.value);
return 0;
@@ -674,14 +662,12 @@ static __inline__ int __sdp_conn_state_d
for (counter = 0;
SDP_CONN_ST_INVALID != conn->state_rec.state[counter];
- counter++) {
-
+ counter++)
sdp_dbg_init("STATE: counter <%02x> state <%04x> <%s:%d>",
counter,
conn->state_rec.state[counter],
conn->state_rec.file[counter],
conn->state_rec.line[counter]);
- }
#endif
return 0;
} /* __sdp_conn_state_dump */
@@ -699,10 +685,8 @@ static inline void __sdp_conn_hold(struc
*/
static inline void __sdp_conn_put(struct sdp_opt *conn)
{
- if (atomic_dec_and_test(&conn->refcnt)) {
-
+ if (atomic_dec_and_test(&conn->refcnt))
(void)sdp_conn_destruct(conn);
- }
} /* __sdp_conn_hold */
/*
_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
