1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c
index 6493049b663d..45182ab41d6b 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -32,6 +32,7 @@
 #endif /* CONFIG_IXGBE_DCB */
 #include <linux/if_ether.h>
 #include <linux/gfp.h>
+#include <linux/if_vlan.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/fc/fc_fs.h>
@@ -312,10 +313,12 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
         if (fcerr == IXGBE_FCERR_BADCRC)
                 skb->ip_summed = CHECKSUM_NONE;
 
-        skb_reset_network_header(skb);
-        skb_set_transport_header(skb, skb_network_offset(skb) +
-                                 sizeof(struct fcoe_hdr));
-        fh = (struct fc_frame_header *)skb_transport_header(skb);
+        if (eth_hdr(skb)->h_proto == htons(ETH_P_8021Q))
+                fh = (struct fc_frame_header *)(skb->data +
+                        sizeof(struct vlan_hdr) + sizeof(struct fcoe_hdr));
+        else
+                fh = (struct fc_frame_header *)(skb->data +
+                        sizeof(struct fcoe_hdr));
         fctl = ntoh24(fh->fh_f_ctl);
         if (fctl & FC_FC_EX_CTX)
                 xid =  be16_to_cpu(fh->fh_ox_id);
@@ -536,12 +539,6 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)
                 }
                 IXGBE_WRITE_REG(hw, IXGBE_FCRECTL, IXGBE_FCRECTL_ENA);
                 IXGBE_WRITE_REG(hw, IXGBE_ETQS(IXGBE_ETQF_FILTER_FCOE), 0);
-                fcoe_i = f->mask;
-                fcoe_i &= IXGBE_FCRETA_ENTRY_MASK;
-                fcoe_q = adapter->rx_ring[fcoe_i]->reg_idx;
-                IXGBE_WRITE_REG(hw, IXGBE_ETQS(IXGBE_ETQF_FILTER_FIP),
-                                IXGBE_ETQS_QUEUE_EN |
-                                (fcoe_q << IXGBE_ETQS_RX_QUEUE_SHIFT));
         } else  {
                 /* Use single rx queue for FCoE */
                 fcoe_i = f->mask;