net driver fix
Subsystems (2)
PATCH 1/1 net driver fix
Please pull from 'upstream-fixes' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
to receive the following updates:
drivers/net/sis900.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Daniele Venzano:
Fix Wake on LAN support in sis900
drivers/net/sis900.c +2 -2
@@ -540,7 +540,7 @@ static int __devinit sis900_probe(structprintk ("%2.2x.\n" , net_dev->dev_addr[i]);/* Detect Wake on Lan support */ - ret =inl (CFGPMC &PMESP ); + ret = (inl (net_dev->base_addr +CFGPMC ) &PMESP ) >>27 ;if (netif_msg_probe (sis_priv) && (ret &PME_D3C ) ==0 )printk (KERN_INFO "%s: Wake on LAN only available from suspend to RAM." , net_dev->name);
@@ -2040,7 +2040,7 @@ static int sis900_set_wol(struct net_devif (wol->wolopts ==0 ) {pci_read_config_dword (sis_priv->pci_dev,CFGPMCSR , &cfgpmcsr); - cfgpmcsr |= ~PME_EN ; + cfgpmcsr &= ~PME_EN ;pci_write_config_dword (sis_priv->pci_dev,CFGPMCSR , cfgpmcsr);outl (pmctrl_bits, pmctrl_addr);if (netif_msg_wol (sis_priv))