From 8e50aa51c9e2547251e4323d839b64d0095bc7ef Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 26 Sep 2001 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2001-09-26

---
 ip/esp.c       | 4 ++--
 pc/devarch.c   | 3 ++-
 port/chan.c    | 2 +-
 port/devdraw.c | 2 +-
 port/devsdp.c  | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ip/esp.c b/ip/esp.c
index 550f9ad9cdd38624f873851eb945485fc2801353..a59b134c2a6285c565063f0e48e51f19ac2f60fd 100644
--- a/ip/esp.c
+++ b/ip/esp.c
@@ -776,7 +776,7 @@ rc4cipher(Espcb *ecb, uchar *p, int n)
 print("missing packet: %uld %ld\n", seq, d);
 			// this link is hosed
 			if(d > RC4forward) {
-				strcpy(up->error, "rc4cipher: skipped too much");
+				strcpy(up->errstr, "rc4cipher: skipped too much");
 				return 0;
 			}
 			esprc4->lgseq = seq;
@@ -792,7 +792,7 @@ print("missing packet: %uld %ld\n", seq, d);
 print("reordered packet: %uld %ld\n", seq, d);
 			dd = seq - esprc4->oseq;
 			if(!esprc4->ovalid || -d > RC4back || dd < 0) {
-				strcpy(up->error, "rc4cipher: too far back");
+				strcpy(up->errstr, "rc4cipher: too far back");
 				return 0;
 			}
 			memmove(&tmpstate, &esprc4->old, sizeof(RC4state));
diff --git a/pc/devarch.c b/pc/devarch.c
index 03aad5be4394b369e2b8e9cea51223e235eeda18..bf228fbc094330ca8889533b31c02be00707f3f4 100644
--- a/pc/devarch.c
+++ b/pc/devarch.c
@@ -107,7 +107,8 @@ ioinit(void)
 
 	// a dummy entry at 2^16
 	ioalloc(0x10000, 1, 0, "dummy");
-	ioalloc(0x1000, 1, 0, "dummy");
+	ioalloc(0x0fff, 1, 0, "dummy");	// i82557 is at 0x1000, the dummy
+							// entry is needed for swappable devs.
 }
 
 // Reserve a range to be ioalloced later.  This is in particular useful for exchangable cards, such
diff --git a/port/chan.c b/port/chan.c
index 996f1b1d9bd9567d66fc38e6bf20f67969a340a5..fdf428807e62e6dbc3a8d7eab10f1bdaefe41615 100644
--- a/port/chan.c
+++ b/port/chan.c
@@ -353,7 +353,7 @@ cclose(Chan *c)
 		return;
 
 	if(waserror()){
-//		print("cclose error: type %C; error %s\n", devtab[c->type]->dc, up!=nil? up->error : "no user");
+//		print("cclose error: type %C; error %s\n", devtab[c->type]->dc, up!=nil? up->errstr : "no user");
 		chanfree(c);
 		return;
 	}
diff --git a/port/devdraw.c b/port/devdraw.c
index 43b76bdabccb45c6c467b94eee832fc08aa6d260..19aede8f70ead928cb27550347c0ceaffc2f4478 100644
--- a/port/devdraw.c
+++ b/port/devdraw.c
@@ -1292,7 +1292,7 @@ drawmesg(Client *client, void *av, int n)
 	fmt = nil;
 	if(waserror()){
 		if(fmt) printmesg(fmt, a, 1);
-	/*	iprint("error: %s\n", up->error);	*/
+	/*	iprint("error: %s\n", up->errstr);	*/
 		nexterror();
 	}
 	while((n-=m) > 0){
diff --git a/port/devsdp.c b/port/devsdp.c
index 2efbb6a54cd300c097025ccf6f28bdced66d9180..7c0329e3c82331effea71de56dbe10a373c60733 100644
--- a/port/devsdp.c
+++ b/port/devsdp.c
@@ -1818,7 +1818,7 @@ convreader(void *a)
 		}
 		qlock(c);
 		if(b == nil) {
-			if(strcmp(up->error, Eintr) != 0) {
+			if(strcmp(up->errstr, Eintr) != 0) {
 				convsetstate(c, CClosed);
 				break;
 			}