--- drivers/net/e1000e/netdev.c

+++ drivers/net/e1000e/netdev.c

@@ -665,6 +665,8 @@ static bool e1000_clean_tx_irq(struct e1

i = 0;

}

+ if (i == tx_ring->next_to_use)

+ break;

eop = tx_ring->buffer_info[i].next_to_watch;

eop_desc = E1000_TX_DESC(*tx_ring, eop);

}

@@ -3071,13 +3073,18 @@ static int e1000_test_msi(struct e1000_a

/* disable SERR in case the MSI write causes a master abort */

pci_read_config_word(adapter->pdev, PCI_COMMAND, &pci_cmd);

- pci_write_config_word(adapter->pdev, PCI_COMMAND,

- pci_cmd & ~PCI_COMMAND_SERR);

+ if (pci_cmd & PCI_COMMAND_SERR)

+ pci_write_config_word(adapter->pdev, PCI_COMMAND,

+ pci_cmd & ~PCI_COMMAND_SERR);

err = e1000_test_msi_interrupt(adapter);

- /* restore previous setting of command word */

- pci_write_config_word(adapter->pdev, PCI_COMMAND, pci_cmd);

+ /* re-enable SERR */

+ if (pci_cmd & PCI_COMMAND_SERR) {

+ pci_read_config_word(adapter->pdev, PCI_COMMAND, &pci_cmd);

+ pci_cmd |= PCI_COMMAND_SERR;

+ pci_write_config_word(adapter->pdev, PCI_COMMAND, pci_cmd);

+ }

/* success ! */

if (!err)

@@ -5360,6 +5367,7 @@ static struct pci_device_id e1000_pci_tb

{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_C), board_ich8lan },

{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M), board_ich8lan },

{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M_AMT), board_ich8lan },

+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_82567V_3), board_ich8lan },

{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE), board_ich9lan },

{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_G), board_ich9lan },