summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasu Dev2009-05-06 19:52:46 +0200
committerJames Bottomley2009-06-08 20:29:16 +0200
commit4e57e1cbbd1435b523b9cedb949728e9fdcfb5d4 (patch)
tree691339538848a618713cae0a579ddf7cd40f7a52
parent[SCSI] fcoe: removes fcoe_watchdog (diff)
downloadkernel-qcow2-linux-4e57e1cbbd1435b523b9cedb949728e9fdcfb5d4.tar.gz
kernel-qcow2-linux-4e57e1cbbd1435b523b9cedb949728e9fdcfb5d4.tar.xz
kernel-qcow2-linux-4e57e1cbbd1435b523b9cedb949728e9fdcfb5d4.zip
[SCSI] fcoe: removes reserving memory for vlan_ethdr on tx path
This is not required as VLAN header is added by device interface driver, this was causing bad FC_CRC in FCoE pkts when using VLAN interface. Signed-off-by: Vasu Dev <vasu.dev@intel.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-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 6e7a700f5d54..e606b4829d44 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -1037,8 +1037,7 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp)
sof = fr_sof(fp);
eof = fr_eof(fp);
- elen = (fc->real_dev->priv_flags & IFF_802_1Q_VLAN) ?
- sizeof(struct vlan_ethhdr) : sizeof(struct ethhdr);
+ elen = sizeof(struct ethhdr);
hlen = sizeof(struct fcoe_hdr);
tlen = sizeof(struct fcoe_crc_eof);
wlen = (skb->len - tlen + sizeof(crc)) / FCOE_WORD_TO_BYTE;