--- /sys/doc/port.ps	Wed Jan 30 23:15:09 2013
+++ /sys/doc/port.ps	Thu Mar 14 01:16:12 2013
@@ -5390,31 +5390,31 @@
 (The Broadcom 2835 operating system) 720 2952 w
 10 /LucidaSansUnicode00 f
 (This) 970 3108 w
-(is) 1208 3108 w
-(terminal) 1321 3108 w
-(and) 1756 3108 w
-(CPU) 1969 3108 w
-(kernels) 2195 3108 w
-(for) 2581 3108 w
-(the) 2754 3108 w
-(ARM1176) 2943 3108 w
-(processor) 3447 3108 w
-(in) 3957 3108 w
-(the) 4082 3108 w
-(Broadcom) 4271 3108 w
-(2835) 4788 3108 w
-(system-on-a-chip.) 720 3228 w
-(The) 1733 3228 w
-(hardware) 1966 3228 w
-(includes) 2468 3228 w
-(VFP2) 2923 3228 w
-(floating-point.) 3212 3228 w
-(It) 4010 3228 w
-(runs) 4128 3228 w
-(on) 4395 3228 w
-(the) 4569 3228 w
-(Rasp\255) 4775 3228 w
-(berry Pi Model B.) 720 3348 w
+(consists) 1209 3108 w
+(of) 1636 3108 w
+(terminal) 1768 3108 w
+(and) 2204 3108 w
+(CPU) 2418 3108 w
+(kernels) 2645 3108 w
+(for) 3033 3108 w
+(the) 3207 3108 w
+(ARM1176) 3397 3108 w
+(processor) 3902 3108 w
+(in) 4413 3108 w
+(the) 4539 3108 w
+(Broad\255) 4729 3108 w
+(com) 720 3228 w
+(2835) 973 3228 w
+(system-on-a-chip.) 1273 3228 w
+(The) 2282 3228 w
+(hardware) 2511 3228 w
+(includes) 3009 3228 w
+(VFP2) 3460 3228 w
+(floating-point.) 3745 3228 w
+(It) 4539 3228 w
+(runs) 4653 3228 w
+(on) 4917 3228 w
+(the Raspberry Pi Models A and B.) 720 3348 w
 cleartomark
 showpage
 saveobj restore
--- /sys/man/1/8l	Fri Mar  8 21:12:36 2013
+++ /sys/man/1/8l	Fri Mar 15 00:11:38 2013
@@ -182,15 +182,15 @@
 .B obj.c
 in the source directory for a complete list.
 .TP
-.B -P
+.B -k
 (ELF only)
-Executable is standalone boot image or kernel.
+Executable is a standalone boot image or kernel.
 .TP
 .BI -T t
 The text segment starts at (virtual) address
 .IR t .
 .TP
-.BI -F t
+.BI -P t
 (ELF only)
 The text segment starts at physical address
 .I t
--- /sys/src/9/pc/ether82563.c	Tue Mar  5 22:49:27 2013
+++ /sys/src/9/pc/ether82563.c	Thu Mar 14 00:55:15 2013
@@ -1631,6 +1631,9 @@
 		case 0x105e:
 			type = i82571;
 			break;
+		case 0x107d:		/* eb copper */
+		case 0x107e:		/* ei fiber */
+		case 0x107f:		/* ei */
 		case 0x10b9:		/* sic, 82572gi */
 			type = i82572;
 			break;
--- /sys/src/cmd/cc/pswt.c	Thu Mar  8 06:37:02 2012
+++ /sys/src/cmd/cc/pswt.c	Wed Mar 13 20:30:01 2013
@@ -57,7 +57,7 @@
 		q++;
 	}
 	qsort(iq, nc, sizeof(C1), swcmp);
-	if(debug['W'])
+	if(debug['K'])
 	for(i=0; i<nc; i++)
 		print("case %2ld: = %.8llux\n", i, (vlong)iq[i].val);
 	dup = 0;
--- /sys/src/cmd/ip/tftpd.c	Tue Sep 18 00:56:03 2012
+++ /sys/src/cmd/ip/tftpd.c	Sat Mar 16 21:20:56 2013
@@ -509,7 +509,7 @@
 }
 
 static int
-awaitack(int fd, int block)
+awaitack(int net, int block)
 {
 	int ackblock, al, rxl;
 	ushort op;
@@ -518,7 +518,7 @@
 	for(rxl = 0; rxl < 10; rxl++) {
 		memset(ack, 0, Hdrsize);
 		alarm(1000);
-		al = read(fd, ack, sizeof(ack));
+		al = read(net, ack, sizeof(ack));
 		alarm(0);
 		if(al < 0) {
 			if (Debug)
@@ -557,18 +557,19 @@
 }
 
 void
-sendfile(int fd, char *name, char *mode, int opts)
+sendfile(int net, char *name, char *mode, int opts)
 {
-	int file, block, ret, rexmit, n, txtry;
+	int file, block, ret, rexmit, n, txtry, failed;
 	uchar buf[Maxsegsize+Hdrsize];
 	char errbuf[Maxerr];
 
 	file = -1;
+	failed = 1;
 	syslog(dbg, flog, "tftpd %d send file '%s' %s to %s",
 		pid, name, mode, raddr);
 	name = sunkernel(name);
 	if(name == 0){
-		nak(fd, 0, "not in our database");
+		nak(net, 0, "not in our database");
 		goto error;
 	}
 
@@ -577,7 +578,7 @@
 	file = open(name, OREAD);
 	if(file < 0) {
 		errstr(errbuf, sizeof errbuf);
-		nak(fd, 0, errbuf);
+		nak(net, 0, errbuf);
 		goto error;
 	}
 	block = 0;
@@ -590,7 +591,7 @@
 	 * pxe just read-with-tsize to get size, couldn't be bothered to
 	 * ack our oack and has just gone ahead and issued another read.
 	 */
-	if(opts && awaitack(fd, 0) != Ackok)
+	if(opts && awaitack(net, 0) != Ackok)
 		goto error;
 
 	for(txtry = 0; txtry < timeout;) {
@@ -603,7 +604,7 @@
 			n = read(file, buf+Hdrsize, blksize);
 			if(n < 0) {
 				errstr(errbuf, sizeof errbuf);
-				nak(fd, 0, errbuf);
+				nak(net, 0, errbuf);
 				goto error;
 			}
 			txtry = 0;
@@ -614,7 +615,7 @@
 			txtry++;
 		}
 
-		ret = write(fd, buf, Hdrsize+n);
+		ret = write(net, buf, Hdrsize+n);
 		if(ret < Hdrsize+n) {
 			syslog(dbg, flog,
 				"tftpd network write error on %s to %s: %r",
@@ -624,21 +625,23 @@
 		if (Debug)
 			syslog(dbg, flog, "tftpd %d sent block %d", pid, block);
 
-		rexmit = awaitack(fd, block);
+		rexmit = awaitack(net, block);
 		if (rexmit == Ackerr)
 			break;
-		if(ret != blksize+Hdrsize && rexmit == Ackok)
+		if(ret != blksize+Hdrsize && rexmit == Ackok) {
+			failed = 0;
 			break;
+		}
 	}
-	syslog(dbg, flog, "tftpd %d done sending file '%s' %s to %s",
-		pid, name, mode, raddr);
 error:
-	close(fd);
+	syslog(dbg, flog, "tftpd %d %s file '%s' %s to %s",
+		pid, (failed? "failed to send": "sent"), name, mode, raddr);
+	close(net);
 	close(file);
 }
 
 void
-recvfile(int fd, char *name, char *mode)
+recvfile(int net, char *name, char *mode)
 {
 	ushort op, block, inblock;
 	uchar buf[Maxsegsize+8];
@@ -650,18 +653,18 @@
 	file = create(name, OWRITE, 0666);
 	if(file < 0) {
 		errstr(errbuf, sizeof errbuf);
-		nak(fd, 0, errbuf);
+		nak(net, 0, errbuf);
 		syslog(dbg, flog, "can't create %s: %r", name);
 		return;
 	}
 
 	block = 0;
-	ack(fd, block);
+	ack(net, block);
 	block++;
 
 	for (;;) {
 		alarm(15000);
-		n = read(fd, buf, blksize+8);
+		n = read(net, buf, blksize+8);
 		alarm(0);
 		if(n < 0) {
 			syslog(dbg, flog, "tftpd: network error reading %s: %r",
@@ -691,16 +694,16 @@
 				ret = write(file, buf+Hdrsize, n);
 				if(ret != n) {
 					errstr(errbuf, sizeof errbuf);
-					nak(fd, 0, errbuf);
+					nak(net, 0, errbuf);
 					syslog(dbg, flog,
 					    "tftpd: error writing %s: %s",
 						name, errbuf);
 					goto error;
 				}
-				ack(fd, block);
+				ack(net, block);
 				block++;
 			} else
-				ack(fd, 0xffff);	/* tell him to resend */
+				ack(net, 0xffff);	/* tell him to resend */
 		}
 	}
 error: