Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 165c68d5 authored by Ian Campbell's avatar Ian Campbell Committed by David S. Miller
Browse files

fcoe: convert to SKB paged frag API. 



Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Reviewed-by: default avatarKonrad 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: default avatarDavid S. Miller <davem@davemloft.net>
parent 94b06fdb

drivers/scsi/fcoe/fcoe.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/scsi/fcoe/fcoe_transport.c

+3 −2
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ 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),

			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);