From f7d83bdb7e581c0a76b4e75e95627aac892e42d9 Mon Sep 17 00:00:00 2001 From: Vasu Dev Date: Wed, 6 May 2009 10:52:46 -0700 Subject: [PATCH] --- yaml --- r: 148107 b: refs/heads/master c: 4e57e1cbbd1435b523b9cedb949728e9fdcfb5d4 h: refs/heads/master i: 148105: 0be699350c1b96b30fb3ba919f34bc68283baed3 148103: 6f779910e04bf8d515a3cdb8201f7146dbd7f472 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 b3d8b7a6727d..651dbd7c17cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1047f22108bd9bfedefd3ff014cb56691dfbaa3f +refs/heads/master: 4e57e1cbbd1435b523b9cedb949728e9fdcfb5d4 diff --git a/trunk/drivers/scsi/fcoe/fcoe.c b/trunk/drivers/scsi/fcoe/fcoe.c index 6e7a700f5d54..e606b4829d44 100644 --- a/trunk/drivers/scsi/fcoe/fcoe.c +++ b/trunk/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;