From cc0ac0f520d8f899f909ad19cca7b0123f8350ef Mon Sep 17 00:00:00 2001
From: Stefan Assmann <sassmann@redhat.com>
Date: Fri, 9 Apr 2010 09:51:34 +0000
Subject: [PATCH] --- yaml --- r: 189863 b: refs/heads/master c:
 d5aa22520dbb49e726420ca56b3dcfe56724d33e h: refs/heads/master i:   189861:
 aa3af1c24003d6523b86f43d16bcc7c72c850e14   189859:
 0ddbbfe58f3f66e97830641b8224204abc22a046   189855:
 7d6bccab8201755a0cda2c5dc043898c8a79a977 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/igb/igb_ethtool.c | 1 +
 trunk/drivers/net/igb/igb_main.c    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 51ffb354d0d8..b6607d9a53a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e413f22e4c1cbfe12907e462a7d739a2e316f2b
+refs/heads/master: d5aa22520dbb49e726420ca56b3dcfe56724d33e
diff --git a/trunk/drivers/net/igb/igb_ethtool.c b/trunk/drivers/net/igb/igb_ethtool.c
index d313fae992da..743038490104 100644
--- a/trunk/drivers/net/igb/igb_ethtool.c
+++ b/trunk/drivers/net/igb/igb_ethtool.c
@@ -1814,6 +1814,7 @@ static int igb_wol_exclusion(struct igb_adapter *adapter,
 		retval = 0;
 		break;
 	case E1000_DEV_ID_82576_QUAD_COPPER:
+	case E1000_DEV_ID_82576_QUAD_COPPER_ET2:
 		/* quad port adapters only support WoL on port A */
 		if (!(adapter->flags & IGB_FLAG_QUAD_PORT_A)) {
 			wol->supported = 0;
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
index 9b3c51ab1758..c9baa2aa98cd 100644
--- a/trunk/drivers/net/igb/igb_main.c
+++ b/trunk/drivers/net/igb/igb_main.c
@@ -1612,6 +1612,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
 			adapter->eeprom_wol = 0;
 		break;
 	case E1000_DEV_ID_82576_QUAD_COPPER:
+	case E1000_DEV_ID_82576_QUAD_COPPER_ET2:
 		/* if quad port adapter, disable WoL on all but port A */
 		if (global_quad_port_a != 0)
 			adapter->eeprom_wol = 0;