From da10b6db9fb3a22e079bdb7f518d2e866bd4e047 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 13 Jul 1994 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1994-07-13

---
 boot/boot.c   | 4 ++--
 pc/devether.c | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/boot/boot.c b/boot/boot.c
index a577012f2c9ba9026fa01163b1808f3c78ae4a72..229fc0edf78f69e0ba6ab8587e75ca16f434301e 100644
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -215,13 +215,13 @@ rootserver(char *arg)
 			outin(prompt, reply, sizeof(reply));
 		mp = findmethod(reply);
 		if(mp){
-			for(cp = reply; bargc < Nbarg-1 && *cp; cp++){
+			for(cp = reply; bargc < Nbarg-1 && *cp;){
 				while(*cp && *cp != ' ')
 					cp++;
 				while(*cp == ' ')
 					*cp++ = 0;
 				if(*cp)
-					bargv[bargc++] = cp;
+					bargv[bargc++] = cp++;
 			}
 			cp = strchr(reply, '!');
 			if(cp)
diff --git a/pc/devether.c b/pc/devether.c
index 72c7fc4aed2a266c2a22e99ee663fdcb31074d85..2446f7506a140b54d0cc128ce43adda52748b752 100644
--- a/pc/devether.c
+++ b/pc/devether.c
@@ -175,9 +175,7 @@ etherreset(void)
 {
 	Ether *ctlr;
 	int i, n, ctlrno;
-	ulong irqmask;
 
-	irqmask = 0;
 	for(ctlr = 0, ctlrno = 0; ctlrno < MaxEther; ctlrno++){
 		if(ctlr == 0)
 			ctlr = malloc(sizeof(Ether));
@@ -197,10 +195,7 @@ etherreset(void)
 			 */
 			if(ctlr->irq == 2)
 				ctlr->irq = 9;
-			if((irqmask & (1<<ctlr->irq)) == 0){
-				setvec(Int0vec+ctlr->irq, ctlr->interrupt, ctlr);
-				irqmask |= 1<<ctlr->irq;
-			}
+			setvec(Int0vec+ctlr->irq, ctlr->interrupt, ctlr);
 
 			print("ether%d: %s: port %lux irq %d addr %lux size %d:",
 				ctlrno, ctlr->type, ctlr->port, ctlr->irq, ctlr->mem, ctlr->size);