e1000/e1000e: Move PCI-Express device IDs over to e1000e

e1000e will from now on support the PCI-Express adapters that
previously were supported by e1000. This support means better
performance and easier debugging from now on for both the old
PCI-X/PCI hardware and PCI-Express adapters.

This patch also moves 3 recently merged device IDs over to e1000e
that are identical to quad-port versions of already existing
dual port versions. With this last bit every former e1000 pci-e
device should work now with e1000e.

Here is a brief list of which gigabit driver to use with which
adapter:

  e1000:
	82540 -> 82547

  e1000e:
	82571 -> 82573
	ich8, ich9       (82562 or 82566)
	es2lan           (80003eslan)

  igb: (not yet merged, only available from e1000.sf.net)
	82575

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 45f5ee29343f..3beace55b58d 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -194,6 +194,8 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
                 break;
         case E1000_DEV_ID_82571EB_SERDES:
         case E1000_DEV_ID_82572EI_SERDES:
+        case E1000_DEV_ID_82571EB_SERDES_DUAL:
+        case E1000_DEV_ID_82571EB_SERDES_QUAD:
                 hw->media_type = e1000_media_type_internal_serdes;
                 break;
         default:
@@ -260,6 +262,7 @@ static s32 e1000_get_invariants_82571(struct e1000_adapter *adapter)
         case E1000_DEV_ID_82571EB_QUAD_COPPER:
         case E1000_DEV_ID_82571EB_QUAD_FIBER:
         case E1000_DEV_ID_82571EB_QUAD_COPPER_LP:
+        case E1000_DEV_ID_82571PT_QUAD_COPPER:
                 adapter->flags |= FLAG_IS_QUAD_PORT;
                 /* mark the first port */
                 if (global_quad_port_a == 0)
@@ -285,6 +288,9 @@ static s32 e1000_get_invariants_82571(struct e1000_adapter *adapter)
                 if (adapter->flags & FLAG_IS_QUAD_PORT &&
                     (!(adapter->flags & FLAG_IS_QUAD_PORT_A)))
                         adapter->flags &= ~FLAG_HAS_WOL;
+                /* Does not support WoL on any port */
+                if (pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD)
+                        adapter->flags &= ~FLAG_HAS_WOL;
                 break;
 
         case e1000_82573: