Suffer from a slight case of v2p-itis

[netwatch.git] / net / 3c90x.c

diff --git a/net/3c90x.c b/net/3c90x.c
index 3a6c958ee9dde5f3c9489332342cc45dc103a74b..ea7914c673ec8300a6633f01a77f4e3c1b9cf78a 100644 (file)
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -481,20 +481,6 @@ a3c90x_transmit(struct pbuf *p)
        static unsigned int stillwaiting = 0;
        unsigned int n, len;
 
-       if (stillwaiting)
-       {
-               while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running())
-                       ;
-               if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE))
-               {
-                       outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b));
-                       outputf("3c90x: Gen sts %04x", inw(INF_3C90X.IOAddr + regCommandIntStatus_w));
-               }
-               status = inb(INF_3C90X.IOAddr + regTxStatus_b);
-               outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00);
-               stillwaiting = 0;
-       }
-
        _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */);
 
        /** Setup the DPD (download descriptor) **/
@@ -503,7 +489,7 @@ a3c90x_transmit(struct pbuf *p)
        n = 0;
        for (; p; p = p->next)
        {
-               INF_3C90X.TransmitDPD.segments[n].addr = (unsigned int)p->payload;
+               INF_3C90X.TransmitDPD.segments[n].addr = v2p(p->payload);
                INF_3C90X.TransmitDPD.segments[n].len = p->len | (p->next ? 0 : (1 << 31));
                len += p->len;
                n++;
@@ -528,6 +514,19 @@ a3c90x_transmit(struct pbuf *p)
 
        oneshot_start_ms(10);
        stillwaiting = 1;
+       if (stillwaiting)
+       {
+               while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running())
+                       ;
+               if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE))
+               {
+                       outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b));
+                       outputf("3c90x: Gen sts %04x", inw(INF_3C90X.IOAddr + regCommandIntStatus_w));
+               }
+               status = inb(INF_3C90X.IOAddr + regTxStatus_b);
+               outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00);
+               stillwaiting = 0;
+       }
                
 #if 0          
        /** successful completion (sans "interrupt Requested" bit) **/