--- drivers/net/ixgbe/ixgbe_main.c

+++ drivers/net/ixgbe/ixgbe_main.c

@@ -100,8 +100,6 @@ static struct pci_device_id ixgbe_pci_tb

board_82599 },

{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP),

board_82599 },

- {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_EM),

- board_82599 },

{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4_MEZZ),

board_82599 },

{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_CX4),

@@ -793,7 +791,6 @@ static bool ixgbe_clean_rx_irq(struct ix

break;

(*work_done)++;

- rmb(); /* read descriptor and rx_buffer_info after status DD */

if (rx_ring->flags & IXGBE_RING_RX_PS_ENABLED) {

hdr_info = le16_to_cpu(ixgbe_get_hdr_info(rx_desc));

len = (hdr_info & IXGBE_RXDADV_HDRBUFLEN_MASK) >>

@@ -2134,10 +2131,6 @@ static void ixgbe_configure_rx(struct ix

/* Decide whether to use packet split mode or not */

adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;

- /* Disable packet split due to 82599 erratum #45 */

- if (hw->mac.type == ixgbe_mac_82599EB)

- adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;

-

/* Set the RX buffer length according to the mode */

if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {

rx_buf_len = IXGBE_RX_HDR_SIZE;