patch-2.4.0-test2 linux/arch/ppc/8260_io/enet.c

• Lines: 65
• Date: Mon Jun 19 13:25:05 2000
• Orig file: v2.4.0-test1/linux/arch/ppc/8260_io/enet.c
• Orig date: Tue May 23 15:31:33 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/ppc/8260_io/enet.c linux/arch/ppc/8260_io/enet.c
@@ -177,7 +177,7 @@
 #ifndef final_version
 	if (bdp->cbd_sc & BD_ENET_TX_READY) {
 		/* Ooops.  All transmit buffers are full.  Bail out.
-		 * This should not happen, since cep->tx_busy should be set.
+		 * This should not happen, since cep->tx_full should be set.
 		 */
 		printk("%s: tx queue full!.\n", dev->name);
 		return 1;
@@ -207,12 +207,6 @@
 	cep->stats.tx_bytes += skb->len;
 	cep->skb_cur = (cep->skb_cur+1) & TX_RING_MOD_MASK;
 	
-	/* Push the data cache so the CPM does not get stale memory
-	 * data.
-	 */
-	flush_dcache_range((unsigned long)(skb->data),
-					(unsigned long)(skb->data + skb->len));
-
 	spin_lock_irq(&cep->lock);
 
 	/* Send it on its way.  Tell CPM its ready, interrupt when done,
@@ -229,8 +223,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;
 
@@ -254,12 +250,14 @@
 		       cep->cur_tx, cep->tx_full ? " (full)" : "",
 		       cep->cur_rx);
 		bdp = cep->tx_bd_base;
+		printk(" Tx @base %p :\n", bdp);
 		for (i = 0 ; i < TX_RING_SIZE; i++, bdp++)
 			printk("%04x %04x %08x\n",
 			       bdp->cbd_sc,
 			       bdp->cbd_datlen,
 			       bdp->cbd_bufaddr);
 		bdp = cep->rx_bd_base;
+		printk(" Rx @base %p :\n", bdp);
 		for (i = 0 ; i < RX_RING_SIZE; i++, bdp++)
 			printk("%04x %04x %08x\n",
 			       bdp->cbd_sc,
@@ -368,6 +366,7 @@
 		 * full.
 		 */
 		if (cep->tx_full) {
+			cep->tx_full = 0;
 			if (netif_queue_stopped(dev)) {
 				netif_wake_queue(dev);
 			}
@@ -385,6 +384,7 @@
 		 * _should_ pick up without having to reset any of our
 		 * pointers either.
 		 */
+
 		cp = cpmp;
 		cp->cp_cpcr =
 		    mk_cr_cmd(CPM_ENET_PAGE, CPM_ENET_BLOCK, 0,