patch-2.4.0-test2 linux/arch/ppc/8xx_io/enet.c

• Lines: 29
• Date: Mon Jun 19 13:25:06 2000
• Orig file: v2.4.0-test1/linux/arch/ppc/8xx_io/enet.c
• Orig date: Thu May 11 15:30:06 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/ppc/8xx_io/enet.c linux/arch/ppc/8xx_io/enet.c
@@ -263,8 +263,10 @@
 	else
 		bdp++;
 
-	if (bdp->cbd_sc & BD_ENET_TX_READY)
+	if (bdp->cbd_sc & BD_ENET_TX_READY) {
 		netif_stop_queue(dev);
+		cep->tx_full = 1;
+	}
 
 	cep->cur_tx = (cbd_t *)bdp;
 
@@ -402,6 +404,7 @@
 		 * full.
 		 */
 		if (cep->tx_full) {
+			cep->tx_full = 0;
 			if (netif_queue_stopped(dev))
 				netif_wake_queue(dev);
 		}
@@ -835,7 +838,7 @@
 
 		/* Make it uncached.
 		*/
-		pte = find_pte(&init_mm, mem_addr);
+		pte = va_to_pte(mem_addr);
 		pte_val(*pte) |= _PAGE_NO_CACHE;
 		flush_tlb_page(init_mm.mmap, mem_addr);