Plan 9 from Bell Labs 2007-11-12

dist/replica/_plan9.db

@@ -8100,7 +8100,7 @@ sys/src/9/pc/etherelnk3.c - 664 sys sys 1158012427 48807
 sys/src/9/pc/etherga620.c - 664 sys sys 1185652495 29895
 sys/src/9/pc/etherga620fw.h - 664 sys sys 1026847642 222295
 sys/src/9/pc/etherif.h - 664 sys sys 1088178711 961
-sys/src/9/pc/etherigbe.c - 664 sys sys 1191886283 45422
+sys/src/9/pc/etherigbe.c - 664 sys sys 1194796690 45327
 sys/src/9/pc/etherm10g.c - 664 sys sys 1174595240 27681
 sys/src/9/pc/etherm10g2k.i - 664 sys sys 1174590360 957485
 sys/src/9/pc/etherm10g4k.i - 664 sys sys 1174590362 926959
@@ -9180,7 +9180,7 @@ sys/src/boot/pc/etherelnk3x.c - 664 sys sys 1015007951 24989
 sys/src/boot/pc/etherga620.c - 664 sys sys 1175289484 27168
 sys/src/boot/pc/etherga620fw.h - 664 sys sys 1174080072 222295
 sys/src/boot/pc/etherif.h - 664 sys sys 1174077279 1338
-sys/src/boot/pc/etherigbe.c - 664 sys sys 1191446222 41284
+sys/src/boot/pc/etherigbe.c - 664 sys sys 1194796683 41188
 sys/src/boot/pc/ethermii.c - 664 sys sys 1103641771 4413
 sys/src/boot/pc/ethermii.h - 664 sys sys 1071175087 3259
 sys/src/boot/pc/etherrhine.c - 664 sys sys 1194655423 12729

dist/replica/plan9.db

@@ -8100,7 +8100,7 @@ sys/src/9/pc/etherelnk3.c - 664 sys sys 1158012427 48807
 sys/src/9/pc/etherga620.c - 664 sys sys 1185652495 29895
 sys/src/9/pc/etherga620fw.h - 664 sys sys 1026847642 222295
 sys/src/9/pc/etherif.h - 664 sys sys 1088178711 961
-sys/src/9/pc/etherigbe.c - 664 sys sys 1191886283 45422
+sys/src/9/pc/etherigbe.c - 664 sys sys 1194796690 45327
 sys/src/9/pc/etherm10g.c - 664 sys sys 1174595240 27681
 sys/src/9/pc/etherm10g2k.i - 664 sys sys 1174590360 957485
 sys/src/9/pc/etherm10g4k.i - 664 sys sys 1174590362 926959
@@ -9180,7 +9180,7 @@ sys/src/boot/pc/etherelnk3x.c - 664 sys sys 1015007951 24989
 sys/src/boot/pc/etherga620.c - 664 sys sys 1175289484 27168
 sys/src/boot/pc/etherga620fw.h - 664 sys sys 1174080072 222295
 sys/src/boot/pc/etherif.h - 664 sys sys 1174077279 1338
-sys/src/boot/pc/etherigbe.c - 664 sys sys 1191446222 41284
+sys/src/boot/pc/etherigbe.c - 664 sys sys 1194796683 41188
 sys/src/boot/pc/ethermii.c - 664 sys sys 1103641771 4413
 sys/src/boot/pc/ethermii.h - 664 sys sys 1071175087 3259
 sys/src/boot/pc/etherrhine.c - 664 sys sys 1194655423 12729

dist/replica/plan9.log

@@ -53350,3 +53350,5 @@
 1194658204 5 d sys/src/9/pc/etherrhine.c - 664 sys sys 1081706478 0
 1194753604 0 c sys/src/9/port/devaoe.c - 664 sys sys 1194752565 41987
 1194753604 1 c sys/src/9/port/sdaoe.c - 664 sys sys 1194752512 9922
+1194796805 0 c sys/src/9/pc/etherigbe.c - 664 sys sys 1194796690 45327
+1194796805 1 c sys/src/boot/pc/etherigbe.c - 664 sys sys 1194796683 41188

sys/src/9/pc/etherigbe.c

@@ -1776,8 +1776,6 @@ igbereset(Ctlr* ctlr)
 	    BUSFNO(ctlr->pcidev->tbdf) == 1)
 		ctlr->eeprom[Ea+2] += 0x100;		/* second interface */
 	for(i = Ea; i < Eaddrlen/2; i++){
-if(i == Ea && ctlr->id == i82541gi && ctlr->eeprom[i] == 0xFFFF)
-    ctlr->eeprom[i] = 0xD000;
 		ctlr->ra[2*i] = ctlr->eeprom[i];
 		ctlr->ra[2*i+1] = ctlr->eeprom[i]>>8;
 	}

sys/src/boot/pc/etherigbe.c

@@ -1473,8 +1473,6 @@ igbereset(Ctlr* ctlr)
 	    BUSFNO(ctlr->pcidev->tbdf) == 1)
 		ctlr->eeprom[Ea+2] += 0x100;		/* second interface */
 	for(i = Ea; i < Eaddrlen/2; i++){
-		if(i == Ea && ctlr->id == i82541gi && ctlr->eeprom[i] == 0xFFFF)
-			ctlr->eeprom[i] = 0xD000;
 		ctlr->ra[2*i]   = ctlr->eeprom[i];
 		ctlr->ra[2*i+1] = ctlr->eeprom[i]>>8;
 	}