| Message ID | 4BB4D13C.8030303@redhat.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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.
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;