From: Dan Carpenter Date: Sat, 10 Apr 2010 03:07:36 +0000 (-0500) Subject: [SCSI] iscsi_tcp: change & to && X-Git-Tag: v2.6.35-rc1~470^2^2~71 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef7d17a907d89d590831a3995ed8638a9ad394bc;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git [SCSI] iscsi_tcp: change & to && This change is basically a clean up. datadgst_en is an int which comes from the user. I didn't see anything limiting it to 1 and 0 although obviously that's what it's supposed to be. If the user passed in 2 this test would fail. This same if condition is repeated in another function and it uses && there. Signed-off-by: Dan Carpenter Signed-off-by: Mike Christie Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c index 5c92620..8eeb39f 100644 --- a/drivers/scsi/libiscsi_tcp.c +++ b/drivers/scsi/libiscsi_tcp.c @@ -421,7 +421,7 @@ iscsi_tcp_data_recv_prep(struct iscsi_tcp_conn *tcp_conn) struct iscsi_conn *conn = tcp_conn->iscsi_conn; struct hash_desc *rx_hash = NULL; - if (conn->datadgst_en & + if (conn->datadgst_en && !(conn->session->tt->caps & CAP_DIGEST_OFFLOAD)) rx_hash = tcp_conn->rx_hash;