Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[deliverable/linux.git] / drivers / scsi / fcoe / fcoe_transport.c

diff --git a/drivers/scsi/fcoe/fcoe_transport.c b/drivers/scsi/fcoe/fcoe_transport.c
index 7264d0d5d737e8aa353d04081c1e0023c508980c..bd97b2273f20bc545c4d97aa742294777bb6fc49 100644 (file)
--- a/drivers/scsi/fcoe/fcoe_transport.c
+++ b/drivers/scsi/fcoe/fcoe_transport.c
@@ -206,11 +206,12 @@ u32 fcoe_fc_crc(struct fc_frame *fp)
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                frag = &skb_shinfo(skb)->frags[i];
                off = frag->page_offset;
-               len = frag->size;
+               len = skb_frag_size(frag);
                while (len > 0) {
                        clen = min(len, PAGE_SIZE - (off & ~PAGE_MASK));
-                       data = kmap_atomic(frag->page + (off >> PAGE_SHIFT),
-                                          KM_SKB_DATA_SOFTIRQ);
+                       data = kmap_atomic(
+                               skb_frag_page(frag) + (off >> PAGE_SHIFT),
+                               KM_SKB_DATA_SOFTIRQ);
                        crc = crc32(crc, data + (off & ~PAGE_MASK), clen);
                        kunmap_atomic(data, KM_SKB_DATA_SOFTIRQ);
                        off += clen;