Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / net / e1000 / e1000_main.c

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 59579b1d8843221304a143f638e59d49f2deba1b..7aa458f7d8b862c91471babc4ebe46232e5b9ec3 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,}
 };
@@ -4310,8 +4277,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 +4285,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 +4462,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);
                }
@@ -5284,7 +5247,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