Signed-off-by: Tom Duffy <[EMAIL PROTECTED]>
Index: linux-2.6.10-openib/drivers/infiniband/ulp/sdp/sdp_pass.c
===================================================================
--- linux-2.6.10-openib/drivers/infiniband/ulp/sdp/sdp_pass.c (revision 1836)
+++ linux-2.6.10-openib/drivers/infiniband/ulp/sdp/sdp_pass.c (working copy)
@@ -52,7 +52,6 @@ static int _sdp_cm_accept(struct sdp_opt
* build listen response headers
*/
if (sizeof(struct msg_hello_ack) > conn->recv_size) {
-
sdp_dbg_warn(conn, "buffer size <%d> too small. <%Zu>",
conn->recv_size, sizeof(struct msg_hello_ack));
result = -ENOBUFS;
@@ -64,7 +63,6 @@ static int _sdp_cm_accept(struct sdp_opt
*/
buff = sdp_buff_pool_get();
if (NULL == buff) {
-
sdp_dbg_warn(conn, "Failed to allocate buff for Hello Ack.");
result = -ENOMEM;
goto error;
@@ -100,7 +98,6 @@ static int _sdp_cm_accept(struct sdp_opt
*/
result = sdp_buff_q_put(&conn->send_post, buff);
if (0 > result) {
-
sdp_dbg_warn(conn, "Error <%d> buffering hello ack packet.",
result);
@@ -114,7 +111,6 @@ static int _sdp_cm_accept(struct sdp_opt
*/
qp_attr = kmalloc(sizeof(*qp_attr), GFP_KERNEL);
if (NULL == qp_attr) {
-
sdp_dbg_warn(conn, "Failed to allocate QP attribute.");
result = -ENOMEM;
goto error;
@@ -126,7 +122,6 @@ static int _sdp_cm_accept(struct sdp_opt
result = ib_cm_init_qp_attr(conn->cm_id, qp_attr, &qp_mask);
if (result) {
-
sdp_dbg_warn(conn, "Error <%d> QP attributes for RTR",
result);
goto error;
@@ -141,7 +136,6 @@ static int _sdp_cm_accept(struct sdp_opt
kfree(qp_attr);
if (result) {
-
sdp_dbg_warn(conn, "Error <%d> modifying QP to RTR.", result);
goto error;
}
@@ -154,7 +148,6 @@ static int _sdp_cm_accept(struct sdp_opt
*/
result = sdp_recv_flush(conn);
if (0 > result) {
-
sdp_dbg_warn(conn, "Error <%d> flushing receive queue",
result);
goto error;
@@ -178,7 +171,6 @@ static int _sdp_cm_accept(struct sdp_opt
result = ib_send_cm_rep(conn->cm_id, ¶m);
if (0 > result) {
-
sdp_dbg_warn(conn, "Error <%d> CM accept request.", result);
goto error;
}
@@ -226,7 +218,6 @@ static int _sdp_cm_listen_lookup(struct
sk = conn->sk;
if (listen_conn->backlog_cnt > listen_conn->backlog_max) {
-
sdp_dbg_warn(listen_conn,
"Listen backlog <%d> too big to accept new conn",
listen_conn->backlog_cnt);
@@ -236,7 +227,6 @@ static int _sdp_cm_listen_lookup(struct
result = sdp_inet_port_inherit(listen_conn, conn);
if (0 > result) {
-
sdp_dbg_warn(listen_conn, "Error <%d> listen port inherit.",
result);
result = -EFAULT;
@@ -283,7 +273,6 @@ static int _sdp_cm_listen_lookup(struct
*/
result = _sdp_cm_accept(conn);
if (0 > result) {
-
sdp_dbg_warn(conn, "Error <%d> CM connect accept", result);
goto locked_err;
}
@@ -292,7 +281,6 @@ static int _sdp_cm_listen_lookup(struct
*/
result = sdp_inet_accept_q_put(listen_conn, conn);
if (0 > result) {
-
sdp_dbg_warn(conn,
"Error <%d> adding socket to accept queue",
result);
@@ -324,28 +312,24 @@ static int _sdp_cm_hello_check(struct ms
* validation and consistency checks
*/
if (msg_hello->bsdh.size != sizeof(struct msg_hello)) {
-
sdp_dbg_warn(NULL, "hello msg size mismatch. (2) <%d:%Zu>",
msg_hello->bsdh.size, sizeof(struct msg_hello));
return -EINVAL;
}
if (SDP_MID_HELLO != msg_hello->bsdh.mid) {
-
sdp_dbg_warn(NULL, "hello msg unexpected ID. <%d>",
msg_hello->bsdh.mid);
return -EINVAL;
}
if (!(0 < msg_hello->hh.max_adv)) {
-
sdp_dbg_warn(NULL, "hello msg, bad zcopy count <%d>",
msg_hello->hh.max_adv);
return -EINVAL;
}
if ((0xF0 & msg_hello->hh.version) != (0xF0 & SDP_MSG_VERSION)) {
-
sdp_dbg_warn(NULL, "hello msg, version mismatch. <%d:%d>",
((0xF0 & msg_hello->hh.version) >> 4),
((0xF0 & SDP_MSG_VERSION) >> 4));
@@ -356,7 +340,6 @@ static int _sdp_cm_hello_check(struct ms
#else
if ((SDP_MSG_IPVER & 0xF0) != (msg_hello->hh.ip_ver & 0xF0)) {
#endif
-
sdp_dbg_warn(NULL, "hello msg, ip version mismatch. <%d:%d>",
msg_hello->hh.ip_ver, SDP_MSG_IPVER);
return -EINVAL;
@@ -402,7 +385,6 @@ int sdp_cm_req_handler(struct ib_cm_id *
*/
result = _sdp_cm_hello_check(msg_hello);
if (0 > result) {
-
sdp_dbg_warn(NULL, "Error <%d> validating hello msg. <%08x>",
result, cm_id->local_id);
goto done;
@@ -412,7 +394,6 @@ int sdp_cm_req_handler(struct ib_cm_id *
*/
conn = sdp_conn_alloc(GFP_KERNEL); /* CM sk reference */
if (NULL == conn) {
-
sdp_dbg_warn(NULL, "Failed to allocate connection. <%08x>",
cm_id->local_id);
result = -ENOMEM;
@@ -461,7 +442,6 @@ int sdp_cm_req_handler(struct ib_cm_id *
event->param.req_rcvd.port,
event->param.req_rcvd.primary_path->pkey);
if (0 > result) {
-
sdp_dbg_warn(conn, "Error <%d> binding connection to HCA/port",
result);
goto error;
@@ -480,7 +460,6 @@ int sdp_cm_req_handler(struct ib_cm_id *
*/
result = _sdp_cm_listen_lookup(conn);
if (0 > result) {
-
sdp_dbg_warn(conn, "Error <%d> matching listen socket queue",
result);
goto error;
_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
