summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorRobert Love <robert.w.love@intel.com>2011-12-16 14:24:49 -0800
committerJames Bottomley <JBottomley@Parallels.com>2012-01-10 17:01:23 -0600
commitf1633011e4fcb65bf65aebeaf4024efdc4c49d6e (patch)
tree04cae3ca39c606fdbca375328ab419a7f40a4d52 /drivers/scsi
parent3a19cbf530648a63fb3f73630046c561f70c6b71 (diff)
[SCSI] fcoe: remove double check if skb is nonlinear
skb_linearize already has a check for skb_is_nonlinear, there is no need to duplicate the check in fcoe.c. This patch simply removes the unnecessary check and calls skb_linearize unconditionally. Reported-by: patrick kelle <patrick.kelle81@gmail.com> Signed-off-by: Robert Love <robert.w.love@intel.com> Acked-by: patrick kelle <patrick.kelle81@gmail.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/fcoe/fcoe.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 8d67467dd9c..e535f95e477 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -1671,8 +1671,7 @@ static void fcoe_recv_frame(struct sk_buff *skb)
skb->dev ? skb->dev->name : "<NULL>");
port = lport_priv(lport);
- if (skb_is_nonlinear(skb))
- skb_linearize(skb); /* not ideal */
+ skb_linearize(skb); /* check for skb_is_nonlinear is within skb_linearize */
/*
* Frame length checks and setting up the header pointers