lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/pcmcia/smc91c92_cs.c
	drivers/net/virtio_net.c
This commit is contained in:
David S. Miller
2010-04-14 05:01:33 -07:00
parent 1253332f75 0110d6f22f
commit dad1e54b12
8 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/igb/igb_main.c
View File

@ -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;