devether: mux bridges, portable netconsole

[plan9front.git] / sys / src / 9 / pc / ethervt6105m.c

diff --git a/sys/src/9/pc/ethervt6105m.c b/sys/src/9/pc/ethervt6105m.c
index 357dc72eda7726cfa4750affc2f32564a198fe53..10c047d5db9c11b063a3f56e994cf35159e7c145 100644 (file)
--- a/sys/src/9/pc/ethervt6105m.c
+++ b/sys/src/9/pc/ethervt6105m.c
@@ -20,8 +20,8 @@
 #include "io.h"
 #include "../port/error.h"
 #include "../port/netif.h"
+#include "../port/etherif.h"
 
-#include "etherif.h"
 #include "ethermii.h"
 
 enum {
@@ -865,7 +865,7 @@ vt6105Mreceive(Ether* edev)
                        }
                        len = ((ds->status & LengthMASK)>>LengthSHIFT)-4;
                        ds->bp->wp = ds->bp->rp+len;
-                       etheriq(edev, ds->bp, 1);
+                       etheriq(edev, ds->bp);
                        bp->rp = (uchar*)ROUNDUP((ulong)bp->rp, 4);
                        ds->addr = PCIWADDR(bp->rp);
                        ds->bp = bp;
@@ -1200,7 +1200,6 @@ vt6105Mpnp(Ether* edev)
         */
        edev->attach = vt6105Mattach;
        edev->transmit = vt6105Mtransmit;
-       edev->interrupt = vt6105Minterrupt;
        edev->ifstat = vt6105Mifstat;
        edev->ctl = nil;
 
@@ -1210,6 +1209,8 @@ vt6105Mpnp(Ether* edev)
 
        edev->maxmtu = ETHERMAXTU+Bslop;
 
+       intrenable(edev->irq, vt6105Minterrupt, edev, edev->tbdf, edev->name);
+
        return 0;
 }