netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next-2.6] igb: restrict WoL for 82576 ET2 Quad Port Server Adapter
@ 2010-04-01 17:00 Stefan Assmann
  2010-04-02  2:34 ` David Miller
  0 siblings, 1 reply; 3+ messages in thread
From: Stefan Assmann @ 2010-04-01 17:00 UTC (permalink / raw)
  To: netdev; +Cc: Duyck, Alexander H, jeffrey.t.kirsher

From: Stefan Assmann <sassmann@redhat.com>

Restrict Wake-on-LAN to first port on 82576 ET2 quad port NICs, as it is
only supported there.

Signed-off-by: Stefan Assmann <sassmann@redhat.com>
---
 drivers/net/igb/igb_ethtool.c |    1 +
 drivers/net/igb/igb_main.c    |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c
index 1d4ee41..cdebfbf 100644
--- a/drivers/net/igb/igb_ethtool.c
+++ b/drivers/net/igb/igb_ethtool.c
@@ -1863,6 +1863,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/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index ea87570..5426f41 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1597,6 +1597,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;
-- 
1.6.6.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH net-next-2.6] igb: restrict WoL for 82576 ET2 Quad Port Server Adapter
  2010-04-01 17:00 [PATCH net-next-2.6] igb: restrict WoL for 82576 ET2 Quad Port Server Adapter Stefan Assmann
@ 2010-04-02  2:34 ` David Miller
  2010-04-02  4:12   ` Jeff Kirsher
  0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2010-04-02  2:34 UTC (permalink / raw)
  To: sassmann; +Cc: netdev, alexander.h.duyck, jeffrey.t.kirsher

From: Stefan Assmann <sassmann@redhat.com>
Date: Thu, 01 Apr 2010 19:00:44 +0200

> From: Stefan Assmann <sassmann@redhat.com>
> 
> Restrict Wake-on-LAN to first port on 82576 ET2 quad port NICs, as it is
> only supported there.
> 
> Signed-off-by: Stefan Assmann <sassmann@redhat.com>

Intel folks I assume you will suck this in and resubmit to
me?

Thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH net-next-2.6] igb: restrict WoL for 82576 ET2 Quad Port Server Adapter
  2010-04-02  2:34 ` David Miller
@ 2010-04-02  4:12   ` Jeff Kirsher
  0 siblings, 0 replies; 3+ messages in thread
From: Jeff Kirsher @ 2010-04-02  4:12 UTC (permalink / raw)
  To: David Miller
  Cc: sassmann@redhat.com, netdev@vger.kernel.org, Duyck, Alexander H

On Thu, 2010-04-01 at 19:34 -0700, David Miller wrote:
> From: Stefan Assmann <sassmann@redhat.com>
> Date: Thu, 01 Apr 2010 19:00:44 +0200
> 
> > From: Stefan Assmann <sassmann@redhat.com>
> > 
> > Restrict Wake-on-LAN to first port on 82576 ET2 quad port NICs, as it is
> > only supported there.
> > 
> > Signed-off-by: Stefan Assmann <sassmann@redhat.com>
> 
> Intel folks I assume you will suck this in and resubmit to
> me?
> 
> Thanks.

Correct, I am sucking this in to my tree.
-- 
Cheers,
Jeff


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-04-02  4:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-01 17:00 [PATCH net-next-2.6] igb: restrict WoL for 82576 ET2 Quad Port Server Adapter Stefan Assmann
2010-04-02  2:34 ` David Miller
2010-04-02  4:12   ` Jeff Kirsher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).