[SCSI] fcoe: remove double check if skb is nonlinear
authorRobert Love <robert.w.love@intel.com>
Fri, 16 Dec 2011 22:24:49 +0000 (14:24 -0800)
committerJames Bottomley <JBottomley@Parallels.com>
Tue, 10 Jan 2012 23:01:23 +0000 (17:01 -0600)
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>
drivers/scsi/fcoe/fcoe.c

index 8d67467dd9cec100f52b51803fbe943192421a58..e535f95e4772c27b9bd6c99b811cfa77cdff5add 100644 (file)
@@ -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