From: Robert Love Date: Fri, 16 Dec 2011 22:24:49 +0000 (-0800) Subject: [SCSI] fcoe: remove double check if skb is nonlinear X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f1633011e4fcb65bf65aebeaf4024efdc4c49d6e;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git [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 Signed-off-by: Robert Love Acked-by: patrick kelle Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 8d67467dd9ce..e535f95e4772 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 : ""); 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