diff --git a/[refs] b/[refs]
index 8bdff3df6178..d9842cbc3fd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e05620073625935290120be93a6214b1b52ae34f
+refs/heads/master: 07c00ec449d4d94042063a6900d7d04fdc9f8e62
diff --git a/trunk/drivers/scsi/fcoe/libfcoe.c b/trunk/drivers/scsi/fcoe/libfcoe.c
index 5dae823057ae..0d6f5beb7f9e 100644
--- a/trunk/drivers/scsi/fcoe/libfcoe.c
+++ b/trunk/drivers/scsi/fcoe/libfcoe.c
@@ -633,7 +633,7 @@ int fcoe_percpu_receive_thread(void *arg)
 		 * it's solicited data, in which case, the FCP layer would
 		 * check it during the copy.
 		 */
-		if (lp->crc_offload)
+		if (lp->crc_offload && skb->ip_summed == CHECKSUM_UNNECESSARY)
 			fr_flags(fp) &= ~FCPHF_CRC_UNCHECKED;
 		else
 			fr_flags(fp) |= FCPHF_CRC_UNCHECKED;