]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[SCSI] iscsi_tcp: change & to &&
authorDan Carpenter <error27@gmail.com>
Sat, 10 Apr 2010 03:07:36 +0000 (22:07 -0500)
committerJames Bottomley <James.Bottomley@suse.de>
Sun, 11 Apr 2010 19:03:59 +0000 (14:03 -0500)
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 <error27@gmail.com>
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
drivers/scsi/libiscsi_tcp.c

index 5c92620292fba3b6e35076f366db1b338228c9a4..8eeb39ffa37fd82506673960b4906a88c60654f7 100644 (file)
@@ -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;