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

src/drivers/net/natsemi.c

@@ -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
 	 */

src/drivers/net/natsemi.h

@@ -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] */