2 files changed, 5 insertions, 6 deletions

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index acb3767fdae4..335e85192807 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -1552,7 +1552,7 @@ static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp)
 
         /* crc offload */
         if (likely(lport->crc_offload)) {
-                skb->ip_summed = CHECKSUM_PARTIAL;
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
                 skb->csum_start = skb_headroom(skb);
                 skb->csum_offset = skb->len;
                 crc = 0;
@@ -1569,7 +1569,7 @@ static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp)
                         return -ENOMEM;
                 }
                 frag = &skb_shinfo(skb)->frags[skb_shinfo(skb)->nr_frags - 1];
-                cp = kmap_atomic(skb_frag_page(frag), KM_SKB_DATA_SOFTIRQ)
+                cp = kmap_atomic(skb_frag_page(frag))
                         + frag->page_offset;
         } else {
                 cp = (struct fcoe_crc_eof *)skb_put(skb, tlen);
@@ -1580,7 +1580,7 @@ static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp)
         cp->fcoe_crc32 = cpu_to_le32(~crc);
 
         if (skb_is_nonlinear(skb)) {
-                kunmap_atomic(cp, KM_SKB_DATA_SOFTIRQ);
+                kunmap_atomic(cp);
                 cp = NULL;
         }
 
diff --git a/drivers/scsi/fcoe/fcoe_transport.c b/drivers/scsi/fcoe/fcoe_transport.c
index 0897be0ad7b6..710e149d41b6 100644
--- a/drivers/scsi/fcoe/fcoe_transport.c
+++ b/drivers/scsi/fcoe/fcoe_transport.c
@@ -210,10 +210,9 @@ u32 fcoe_fc_crc(struct fc_frame *fp)
                 while (len > 0) {
                         clen = min(len, PAGE_SIZE - (off & ~PAGE_MASK));
                         data = kmap_atomic(
-                                skb_frag_page(frag) + (off >> PAGE_SHIFT),
-                                KM_SKB_DATA_SOFTIRQ);
+                                skb_frag_page(frag) + (off >> PAGE_SHIFT));
                         crc = crc32(crc, data + (off & ~PAGE_MASK), clen);
-                        kunmap_atomic(data, KM_SKB_DATA_SOFTIRQ);
+                        kunmap_atomic(data);
                         off += clen;
                         len -= clen;
                 }