X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/2a44d50497d0bf670265bd8a2eb5d75cc92ebb08..f8903fddbc2a42d68bfe42a0fb6cf93ed3a14277:/net/3c90x.c

diff --git a/net/3c90x.c b/net/3c90x.c
index e3236d9..30283a2 100644
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -480,6 +480,20 @@ a3c90x_transmit(struct pbuf *p)
 	unsigned char status;
 	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 */);
 
@@ -489,7 +503,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++;
@@ -514,19 +528,6 @@ 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) **/