aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/82571.c
diff options
context:
space:
mode:
authorAuke Kok <auke-jan.h.kok@intel.com>2007-10-31 18:22:05 -0400
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:03:43 -0500
commit040babf9d84e7010c457e9ce69e9eb1c27927c9e (patch)
tree7df8e30837d87bb0e341882d2e11a8eb06dfd090 /drivers/net/e1000e/82571.c
parent1eae4eb2a1c784bf35ee4f8f158cd21cf8c387c1 (diff)
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>
Diffstat (limited to 'drivers/net/e1000e/82571.c')
-rw-r--r--drivers/net/e1000e/82571.c6
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)
194 break; 194 break;
195 case E1000_DEV_ID_82571EB_SERDES: 195 case E1000_DEV_ID_82571EB_SERDES:
196 case E1000_DEV_ID_82572EI_SERDES: 196 case E1000_DEV_ID_82572EI_SERDES:
197 case E1000_DEV_ID_82571EB_SERDES_DUAL:
198 case E1000_DEV_ID_82571EB_SERDES_QUAD:
197 hw->media_type = e1000_media_type_internal_serdes; 199 hw->media_type = e1000_media_type_internal_serdes;
198 break; 200 break;
199 default: 201 default:
@@ -260,6 +262,7 @@ static s32 e1000_get_invariants_82571(struct e1000_adapter *adapter)
260 case E1000_DEV_ID_82571EB_QUAD_COPPER: 262 case E1000_DEV_ID_82571EB_QUAD_COPPER:
261 case E1000_DEV_ID_82571EB_QUAD_FIBER: 263 case E1000_DEV_ID_82571EB_QUAD_FIBER:
262 case E1000_DEV_ID_82571EB_QUAD_COPPER_LP: 264 case E1000_DEV_ID_82571EB_QUAD_COPPER_LP:
265 case E1000_DEV_ID_82571PT_QUAD_COPPER:
263 adapter->flags |= FLAG_IS_QUAD_PORT; 266 adapter->flags |= FLAG_IS_QUAD_PORT;
264 /* mark the first port */ 267 /* mark the first port */
265 if (global_quad_port_a == 0) 268 if (global_quad_port_a == 0)
@@ -285,6 +288,9 @@ static s32 e1000_get_invariants_82571(struct e1000_adapter *adapter)
285 if (adapter->flags & FLAG_IS_QUAD_PORT && 288 if (adapter->flags & FLAG_IS_QUAD_PORT &&
286 (!(adapter->flags & FLAG_IS_QUAD_PORT_A))) 289 (!(adapter->flags & FLAG_IS_QUAD_PORT_A)))
287 adapter->flags &= ~FLAG_HAS_WOL; 290 adapter->flags &= ~FLAG_HAS_WOL;
291 /* Does not support WoL on any port */
292 if (pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD)
293 adapter->flags &= ~FLAG_HAS_WOL;
288 break; 294 break;
289 295
290 case e1000_82573: 296 case e1000_82573: