Browse Source

Plan 9 from Bell Labs 2006-07-29

David du Colombier 17 years ago
parent
commit
cae89f1dbe
4 changed files with 6 additions and 5 deletions
  1. 1 1
      dist/replica/_plan9.db
  2. 1 1
      dist/replica/plan9.db
  3. 1 0
      dist/replica/plan9.log
  4. 3 3
      sys/src/fs/pc/ether82557.c

+ 1 - 1
dist/replica/_plan9.db

@@ -14395,7 +14395,7 @@ sys/src/fs/pc/dosfs.c - 664 sys sys 1146784976 16619
 sys/src/fs/pc/dosfs.h - 664 sys sys 1140167937 2696
 sys/src/fs/pc/ether2114x.c - 664 sys sys 1015110044 31874
 sys/src/fs/pc/ether8139.c - 664 sys sys 1086569718 18552
-sys/src/fs/pc/ether82557.c - 664 sys sys 1141035189 30669
+sys/src/fs/pc/ether82557.c - 664 sys sys 1154067789 30710
 sys/src/fs/pc/ether83815.c - 664 sys sys 1140335463 26764
 sys/src/fs/pc/ether83815.mii.c - 664 sys sys 1049156663 31622
 sys/src/fs/pc/etherdp83820.c - 664 sys sys 1146355081 32045

+ 1 - 1
dist/replica/plan9.db

@@ -14395,7 +14395,7 @@ sys/src/fs/pc/dosfs.c - 664 sys sys 1146784976 16619
 sys/src/fs/pc/dosfs.h - 664 sys sys 1140167937 2696
 sys/src/fs/pc/ether2114x.c - 664 sys sys 1015110044 31874
 sys/src/fs/pc/ether8139.c - 664 sys sys 1086569718 18552
-sys/src/fs/pc/ether82557.c - 664 sys sys 1141035189 30669
+sys/src/fs/pc/ether82557.c - 664 sys sys 1154067789 30710
 sys/src/fs/pc/ether83815.c - 664 sys sys 1140335463 26764
 sys/src/fs/pc/ether83815.mii.c - 664 sys sys 1049156663 31622
 sys/src/fs/pc/etherdp83820.c - 664 sys sys 1146355081 32045

+ 1 - 0
dist/replica/plan9.log

@@ -30219,3 +30219,4 @@
 1153400406 0 c 386/9pxeload - 775 sys sys 1153399639 219632
 1153400406 1 c sys/src/9/pc/ether8169.c - 664 sys sys 1153399639 25120
 1153839605 0 c sys/games/lib/fortunes - 664 sys sys 1153838057 260146
+1154068205 0 c sys/src/fs/pc/ether82557.c - 664 sys sys 1154067789 30710

+ 3 - 3
sys/src/fs/pc/ether82557.c

@@ -660,9 +660,8 @@ receive(Ether* ether)
 			pbp = nil;
 			count = rfd->count & 0x3FFF;
 			if((count < ETHERMAXTU/4) && (pbp = iallocb(count))){
-				memmove(pbp->rp, bp->rp+offsetof(Rfd, data[0]),
-					count);
-				SETWPCNT(bp, count);
+				memmove(pbp->rp, bp->rp+offsetof(Rfd, data[0]), count);
+				SETWPCNT(pbp, count);
 				rfd->count = 0;
 				rfd->field = 0;
 			}
@@ -958,6 +957,7 @@ i82557pci(void)
 		case 0x1050:		/* Intel 82562EZ */
 		case 0x1039:		/* Intel 82801BD PRO/100 VE */
 		case 0x103A:		/* Intel 82562 PRO/100 VE */
+		case 0x103D:		/* Intel 82562 PRO/100 VE */
 		case 0x1064:		/* Intel 82562 PRO/100 VE */
 		case 0x2449:		/* Intel 82562ET */
 			nop = 1;