From 351d3638f526b80f87071d2791ae3590e6d9675c Mon Sep 17 00:00:00 2001 From: Yi Zou Date: Wed, 29 Jul 2009 17:05:32 -0700 Subject: [PATCH] --- yaml --- r: 161030 b: refs/heads/master c: 537029f8e950776951ca2a3fe30121d5c05643d1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libfc/fc_fcp.c | 2 -- trunk/include/scsi/fc_frame.h | 7 ------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 76fc42202f62..8bec4f3797b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15a521b4243f3d61971f8422f3e514ef009a42b8 +refs/heads/master: 537029f8e950776951ca2a3fe30121d5c05643d1 diff --git a/trunk/drivers/scsi/libfc/fc_fcp.c b/trunk/drivers/scsi/libfc/fc_fcp.c index e303e0d12c4b..2069edf80268 100644 --- a/trunk/drivers/scsi/libfc/fc_fcp.c +++ b/trunk/drivers/scsi/libfc/fc_fcp.c @@ -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, diff --git a/trunk/include/scsi/fc_frame.h b/trunk/include/scsi/fc_frame.h index 59511057cee0..c35d2383cc26 100644 --- a/trunk/include/scsi/fc_frame.h +++ b/trunk/include/scsi/fc_frame.h @@ -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)