diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-14 08:01:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-14 08:01:33 -0400 |
commit | dad1e54b121d93ed47690d77736af63d3f11d657 (patch) | |
tree | 36fdd29537e43bbb4f36252e010a591ae6fe20bc /drivers/net/igb/igb_ethtool.c | |
parent | 1253332f75f3774cc84d0b7693152656848901f9 (diff) | |
parent | 0110d6f22f392f976e84ab49da1b42f85b64a3c5 (diff) |
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/igb_ethtool.c')
-rw-r--r-- | drivers/net/igb/igb_ethtool.c | 1 |
1 files changed, 1 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, | |||
1864 | retval = 0; | 1864 | retval = 0; |
1865 | break; | 1865 | break; |
1866 | case E1000_DEV_ID_82576_QUAD_COPPER: | 1866 | case E1000_DEV_ID_82576_QUAD_COPPER: |
1867 | case E1000_DEV_ID_82576_QUAD_COPPER_ET2: | ||
1867 | /* quad port adapters only support WoL on port A */ | 1868 | /* quad port adapters only support WoL on port A */ |
1868 | if (!(adapter->flags & IGB_FLAG_QUAD_PORT_A)) { | 1869 | if (!(adapter->flags & IGB_FLAG_QUAD_PORT_A)) { |
1869 | wol->supported = 0; | 1870 | wol->supported = 0; |