---

yaml --- r: 148107 b: refs/heads/master c: 4e57e1c h: refs/heads/master i: 148105: 0be6993 148103: 6f77991 v: v3
git-mirror · Jun 8, 2009 · f7d83bd · f7d83bd
1 parent 2a71956
commit f7d83bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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;