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

Commit 537029f8 authored by Yi Zou's avatar Yi Zou Committed by James Bottomley
Browse files

[SCSI] libfc: Remove FC_FRAME_SG_LEN in fc_fcp_send_data 



FC_FRAME_SG_LEN is 4 which is too small when offload is enabled. Actually, the
WARN_ON() in fc_fcp_send_data() should be:

	WARN_ON(skb_shinfo(fp_skb(fp))->nr_frags > MAX_SKB_FRAGS);

But since we will not get anything more than 64K anyway, so there is no need
to do this anyway here. Therefore, I am getting rid of FC_FRAME_SG_LEN here
and the WARN_ON here.

Signed-off-by: default avatarYi Zou <yi.zou@intel.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 15a521b4

drivers/scsi/libfc/fc_fcp.c

+0 −2
Original line number Diff line number Diff line
@@ -569,8 +569,6 @@ static int fc_fcp_send_data(struct fc_fcp_pkt *fsp, struct fc_seq *seq, 
		}

		sg_bytes = min(tlen, sg->length - offset);

		if (using_sg) {

			WARN_ON(skb_shinfo(fp_skb(fp))->nr_frags >

				FC_FRAME_SG_LEN);

			get_page(sg_page(sg));

			skb_fill_page_desc(fp_skb(fp),

					   skb_shinfo(fp_skb(fp))->nr_frags,

include/scsi/fc_frame.h

+0 −7
Original line number Diff line number Diff line
@@ -37,13 +37,6 @@ 
#define	FC_FRAME_HEADROOM	32	/* headroom for VLAN + FCoE headers */

#define	FC_FRAME_TAILROOM	8	/* trailer space for FCoE */



/*

 * Information about an individual fibre channel frame received or to be sent.

 * The buffer may be in up to 4 additional non-contiguous sections,

 * but the linear section must hold the frame header.

 */

#define FC_FRAME_SG_LEN		4	/* scatter/gather list maximum length */



#define fp_skb(fp)	(&((fp)->skb))

#define fr_hdr(fp)	((fp)->skb.data)

#define fr_len(fp)	((fp)->skb.len)