diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-04-14 05:01:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-14 05:01:33 -0700 |
| commit | dad1e54b121d93ed47690d77736af63d3f11d657 (patch) | |
| tree | 36fdd29537e43bbb4f36252e010a591ae6fe20bc /drivers/net/igb | |
| parent | stmmac: updated the drv module version (diff) | |
| parent | tun: orphan an skb on tx (diff) | |
| download | linux-dev-dad1e54b121d93ed47690d77736af63d3f11d657.tar.xz linux-dev-dad1e54b121d93ed47690d77736af63d3f11d657.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/virtio_net.c
Diffstat (limited to 'drivers/net/igb')
| -rw-r--r-- | drivers/net/igb/igb_ethtool.c | 1 | ||||
| -rw-r--r-- | 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 55670ae7080a..1b8fd7f4064d 100644 --- a/drivers/net/igb/igb_ethtool.c +++ b/drivers/net/igb/igb_ethtool.c @@ -1864,6 +1864,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 8a1f54fb8a3e..c19b1e0caecd 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -1594,6 +1594,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; |