diff options
| author | Robert Love <robert.w.love@intel.com> | 2011-12-16 17:24:49 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-01-10 18:01:23 -0500 |
| commit | f1633011e4fcb65bf65aebeaf4024efdc4c49d6e (patch) | |
| tree | 04cae3ca39c606fdbca375328ab419a7f40a4d52 | |
| parent | 3a19cbf530648a63fb3f73630046c561f70c6b71 (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>
| -rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) | |||
| 1671 | skb->dev ? skb->dev->name : "<NULL>"); | 1671 | skb->dev ? skb->dev->name : "<NULL>"); |
| 1672 | 1672 | ||
| 1673 | port = lport_priv(lport); | 1673 | port = lport_priv(lport); |
| 1674 | if (skb_is_nonlinear(skb)) | 1674 | skb_linearize(skb); /* check for skb_is_nonlinear is within skb_linearize */ |
| 1675 | skb_linearize(skb); /* not ideal */ | ||
| 1676 | 1675 | ||
| 1677 | /* | 1676 | /* |
| 1678 | * Frame length checks and setting up the header pointers | 1677 | * Frame length checks and setting up the header pointers |
