OSDN Git Service

fcoe: convert to SKB paged frag API.
authorIan Campbell <Ian.Campbell@citrix.com>
Wed, 24 Aug 2011 22:28:15 +0000 (22:28 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 Aug 2011 16:38:43 +0000 (12:38 -0400)
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Robert Love <robert.w.love@intel.com>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: devel@open-fcoe.org
Cc: linux-scsi@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/scsi/fcoe/fcoe.c
drivers/scsi/fcoe/fcoe_transport.c

index ba710e3..3416ab6 100644 (file)
@@ -1514,7 +1514,7 @@ 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(frag->page, KM_SKB_DATA_SOFTIRQ)
+               cp = kmap_atomic(skb_frag_page(frag), KM_SKB_DATA_SOFTIRQ)
                        + frag->page_offset;
        } else {
                cp = (struct fcoe_crc_eof *)skb_put(skb, tlen);
index 41068e8..f6613f9 100644 (file)
@@ -108,8 +108,9 @@ u32 fcoe_fc_crc(struct fc_frame *fp)
                len = frag->size;
                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;