e1000: resolve tx multiqueue bug

[~andy/linux] / drivers / net / e1000 / e1000_main.c

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 59579b1d8843221304a143f638e59d49f2deba1b..cf12b05cd011fcbd4db80d12273731d4c4ff9c03 100644 (file)
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -47,12 +47,6 @@ static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation
  * Macro expands to...
  *   {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
  */
-#ifdef CONFIG_E1000E_ENABLED
-  #define PCIE(x) 
-#else
-  #define PCIE(x) x,
-#endif
-
 static struct pci_device_id e1000_pci_tbl[] = {
        INTEL_E1000_ETHERNET_DEVICE(0x1000),
        INTEL_E1000_ETHERNET_DEVICE(0x1001),
@@ -79,14 +73,6 @@ static struct pci_device_id e1000_pci_tbl[] = {
        INTEL_E1000_ETHERNET_DEVICE(0x1026),
        INTEL_E1000_ETHERNET_DEVICE(0x1027),
        INTEL_E1000_ETHERNET_DEVICE(0x1028),
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x1049))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x104A))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x104B))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x104C))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x104D))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x105E))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x105F))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x1060))
        INTEL_E1000_ETHERNET_DEVICE(0x1075),
        INTEL_E1000_ETHERNET_DEVICE(0x1076),
        INTEL_E1000_ETHERNET_DEVICE(0x1077),
@@ -95,28 +81,9 @@ PCIE(        INTEL_E1000_ETHERNET_DEVICE(0x1060))
        INTEL_E1000_ETHERNET_DEVICE(0x107A),
        INTEL_E1000_ETHERNET_DEVICE(0x107B),
        INTEL_E1000_ETHERNET_DEVICE(0x107C),
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x107D))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x107E))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x107F))
        INTEL_E1000_ETHERNET_DEVICE(0x108A),
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x108B))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x108C))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x1096))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x1098))
        INTEL_E1000_ETHERNET_DEVICE(0x1099),
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x109A))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x10A4))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x10A5))
        INTEL_E1000_ETHERNET_DEVICE(0x10B5),
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x10B9))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x10BA))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x10BB))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x10BC))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x10C4))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x10C5))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x10D5))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x10D9))
-PCIE(  INTEL_E1000_ETHERNET_DEVICE(0x10DA))
        /* required last entry */
        {0,}
 };
@@ -1505,6 +1472,8 @@ e1000_open(struct net_device *netdev)
 
        e1000_irq_enable(adapter);
 
+       netif_start_queue(netdev);
+
        /* fire a link status change interrupt to start the watchdog */
        E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_LSC);
 
@@ -2510,10 +2479,15 @@ e1000_set_rx_mode(struct net_device *netdev)
 
        if (netdev->flags & IFF_PROMISC) {
                rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);
-       } else if (netdev->flags & IFF_ALLMULTI) {
-               rctl |= E1000_RCTL_MPE;
+               rctl &= ~E1000_RCTL_VFE;
        } else {
-               rctl &= ~E1000_RCTL_MPE;
+               if (netdev->flags & IFF_ALLMULTI) {
+                       rctl |= E1000_RCTL_MPE;
+               } else {
+                       rctl &= ~E1000_RCTL_MPE;
+               }
+               if (adapter->hw.mac_type != e1000_ich8lan)
+                       rctl |= E1000_RCTL_VFE;
        }
 
        uc_ptr = NULL;
@@ -4310,8 +4284,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
                if (unlikely(adapter->vlgrp &&
                            (status & E1000_RXD_STAT_VP))) {
                        vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
-                                                le16_to_cpu(rx_desc->special) &
-                                                E1000_RXD_SPC_VLAN_MASK);
+                                                le16_to_cpu(rx_desc->special));
                } else {
                        netif_receive_skb(skb);
                }
@@ -4319,8 +4292,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
                if (unlikely(adapter->vlgrp &&
                            (status & E1000_RXD_STAT_VP))) {
                        vlan_hwaccel_rx(skb, adapter->vlgrp,
-                                       le16_to_cpu(rx_desc->special) &
-                                       E1000_RXD_SPC_VLAN_MASK);
+                                       le16_to_cpu(rx_desc->special));
                } else {
                        netif_rx(skb);
                }
@@ -4497,16 +4469,14 @@ copydone:
 #ifdef CONFIG_E1000_NAPI
                if (unlikely(adapter->vlgrp && (staterr & E1000_RXD_STAT_VP))) {
                        vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
-                               le16_to_cpu(rx_desc->wb.middle.vlan) &
-                               E1000_RXD_SPC_VLAN_MASK);
+                               le16_to_cpu(rx_desc->wb.middle.vlan));
                } else {
                        netif_receive_skb(skb);
                }
 #else /* CONFIG_E1000_NAPI */
                if (unlikely(adapter->vlgrp && (staterr & E1000_RXD_STAT_VP))) {
                        vlan_hwaccel_rx(skb, adapter->vlgrp,
-                               le16_to_cpu(rx_desc->wb.middle.vlan) &
-                               E1000_RXD_SPC_VLAN_MASK);
+                               le16_to_cpu(rx_desc->wb.middle.vlan));
                } else {
                        netif_rx(skb);
                }
@@ -4999,7 +4969,6 @@ e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                if (adapter->hw.mac_type != e1000_ich8lan) {
                        /* enable VLAN receive filtering */
                        rctl = E1000_READ_REG(&adapter->hw, RCTL);
-                       rctl |= E1000_RCTL_VFE;
                        rctl &= ~E1000_RCTL_CFIEN;
                        E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
                        e1000_update_mng_vlan(adapter);
@@ -5011,10 +4980,6 @@ e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                E1000_WRITE_REG(&adapter->hw, CTRL, ctrl);
 
                if (adapter->hw.mac_type != e1000_ich8lan) {
-                       /* disable VLAN filtering */
-                       rctl = E1000_READ_REG(&adapter->hw, RCTL);
-                       rctl &= ~E1000_RCTL_VFE;
-                       E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
                        if (adapter->mng_vlan_id !=
                            (u16)E1000_MNG_VLAN_NONE) {
                                e1000_vlan_rx_kill_vid(netdev,
@@ -5284,7 +5249,6 @@ e1000_netpoll(struct net_device *netdev)
 
        disable_irq(adapter->pdev->irq);
        e1000_intr(adapter->pdev->irq, netdev);
-       e1000_clean_tx_irq(adapter, adapter->tx_ring);
 #ifndef CONFIG_E1000_NAPI
        adapter->clean_rx(adapter, adapter->rx_ring);
 #endif