]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
igb: restrict WoL for 82576 ET2 Quad Port Server Adapter
authorStefan Assmann <sassmann@redhat.com>
Fri, 9 Apr 2010 09:51:34 +0000 (09:51 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Apr 2010 10:03:12 +0000 (03:03 -0700)
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>
Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/igb/igb_ethtool.c
drivers/net/igb/igb_main.c

index d313fae992da8d87c205641067a209de24ec6678..743038490104bbc51b054e2600a71132fbfb86e4 100644 (file)
@@ -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;
index 9b3c51ab1758fb5474cf52cdcf11b67681f869da..c9baa2aa98cd640268924ef2ef891afbdd29ba33 100644 (file)
@@ -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;