20070407-1350 more updates from plan 9 pc kernel, and a few unreachable fixes(!)

1 files changed, 8 insertions, 3 deletions

diff --git a/os/pc/ether79c970.c b/os/pc/ether79c970.c
index 25bf4185..43924a3f 100644
--- a/os/pc/ether79c970.c
+++ b/os/pc/ether79c970.c
@@ -301,6 +301,12 @@ promiscuous(void* arg, int on)
 }
 
 static void
+multicast(void* arg, uchar*, int)
+{
+	promiscuous(arg, 1);
+}
+
+static void
 txstart(Ether* ether)
 {
 	Ctlr *ctlr;
@@ -522,7 +528,6 @@ reset(Ether* ether)
 		ctlr->iow = io32w;
 	}else{
 		print("#l%d: card doesn't talk right\n", ether->ctlrno);
-iprint("#l%d: card doesn't talk right\n", ether->ctlrno);
 		iunlock(ctlr);
 		return -1;
 	}
@@ -539,8 +544,6 @@ iprint("#l%d: card doesn't talk right\n", ether->ctlrno);
 	default:
 		print("#l%d: unknown PCnet card version %.7ux\n",
 			ether->ctlrno, x&0xFFFFFFF);
-iprint("#l%d: unknown PCnet card version %.7ux\n",
-			ether->ctlrno, x&0xFFFFFFF);
 		iunlock(ctlr);
 		return -1;
 	}
@@ -629,6 +632,8 @@ iprint("#l%d: unknown PCnet card version %.7ux\n",
 
 	ether->arg = ether;
 	ether->promiscuous = promiscuous;
+	ether->multicast = multicast;
+//	ether->shutdown = shutdown;
 
 	return 0;
 }