From 11e9132df2147f9dee27f4f6078a014c9f257026 Mon Sep 17 00:00:00 2001 From: Robert Love Date: Fri, 16 Dec 2011 14:24:49 -0800 Subject: [PATCH] --- yaml --- r: 286333 b: refs/heads/master c: f1633011e4fcb65bf65aebeaf4024efdc4c49d6e h: refs/heads/master i: 286331: 5ad9c66779080306bccbf648ac280bd76f27c4ba v: v3 --- [refs] | 2 +- trunk/drivers/scsi/fcoe/fcoe.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fb0d0e5f9bb9..302355c2d7a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a19cbf530648a63fb3f73630046c561f70c6b71 +refs/heads/master: f1633011e4fcb65bf65aebeaf4024efdc4c49d6e diff --git a/trunk/drivers/scsi/fcoe/fcoe.c b/trunk/drivers/scsi/fcoe/fcoe.c index 8d67467dd9ce..e535f95e4772 100644 --- a/trunk/drivers/scsi/fcoe/fcoe.c +++ b/trunk/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