david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe

This commit is contained in:
Michael Brown 2007-11-19 20:14:49 +00:00
parent a1e243d504 9a4ed0f2d5
commit 6855c357a5
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/drivers/net/natsemi.c
View File

@ -332,8 +332,7 @@ static int natsemi_open (struct net_device *netdev)
* With PME set the chip will scan incoming packets but
* nothing will be written to memory.
*/
SavedClkRun = inl (np->ioaddr + ClkRun);
outl (SavedClkRun & ~0x100, np->ioaddr + ClkRun);
outl (inl (np->ioaddr + ClkRun) & ~0x100, np->ioaddr + ClkRun);
/* Set MAC address in NIC
*/

2
src/drivers/net/natsemi.h
View File

@ -182,8 +182,6 @@ enum MIntrCtrl_bits {
MICRIntEn = 0x2,
};
static uint32_t SavedClkRun;
/* CFG bits [13:16] [18:23] */
#define CFG_RESET_SAVE 0xfde000
/* WCSR bits [0:4] [9:10] */