[Linux-mips-commits]CVS: linux/drivers/net/tulip interrupt.c,1.2,1.3 media.c,1.2,1.3 tulip.h,1.5,1.6 tulip_core.c,1.3,1.4

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/net/tulip
In directory usw-pr-cvs1:/tmp/cvs-serv13548/drivers/net/tulip

Modified Files:
	interrupt.c media.c tulip.h tulip_core.c 
Log Message:
Sync to 2.4.7



Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/interrupt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** interrupt.c	2001/07/11 20:55:18	1.2
--- interrupt.c	2001/08/25 02:19:28	1.3
***************
*** 75,79 ****
  			dma_addr_t mapping;
  
! 			skb = tp->rx_buffers[entry].skb = dev_alloc_skb(PKT_BUF_SZ + PKT_BUF_FUDGE);
  			if (skb == NULL)
  				break;
--- 75,79 ----
  			dma_addr_t mapping;
  
! 			skb = tp->rx_buffers[entry].skb = dev_alloc_skb(PKT_BUF_SZ);
  			if (skb == NULL)
  				break;

Index: media.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/media.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** media.c	2001/07/11 20:55:18	1.2
--- media.c	2001/08/25 02:19:28	1.3
***************
*** 233,237 ****
  			} else {
  				csr13val = 1;
! 				csr14val = 0x0003FFFF;
  				csr15dir = (setup[0]<<16) | 0x0008;
  				csr15val = (setup[1]<<16) | 0x0008;
--- 233,237 ----
  			} else {
  				csr13val = 1;
! 				csr14val = 0;
  				csr15dir = (setup[0]<<16) | 0x0008;
  				csr15val = (setup[1]<<16) | 0x0008;
***************
*** 401,405 ****
  
  	tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 : 0);
- 	udelay(1000);
  	return;
  }
--- 401,404 ----

Index: tulip.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/tulip.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tulip.h	2001/08/10 21:32:26	1.5
--- tulip.h	2001/08/25 02:19:28	1.6
***************
*** 28,33 ****
  
  
  /* undefine, or define to various debugging levels (>4 == obscene levels) */
! #define TULIP_DEBUG 1 
  
  /* undefine USE_IO_OPS for MMIO, define for PIO */
--- 28,34 ----
  
  
+ 
  /* undefine, or define to various debugging levels (>4 == obscene levels) */
! #define TULIP_DEBUG 1
  
  /* undefine USE_IO_OPS for MMIO, define for PIO */

Index: tulip_core.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/tulip_core.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tulip_core.c	2001/07/11 20:55:18	1.3
--- tulip_core.c	2001/08/25 02:19:28	1.4
***************
*** 687,691 ****
  		   dev_alloc_skb() provides 16 byte alignment.  But do *not*
  		   use skb_reserve() to align the IP header! */
! 		struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ + PKT_BUF_FUDGE);
  		tp->rx_buffers[i].skb = skb;
  		if (skb == NULL)
--- 687,691 ----
  		   dev_alloc_skb() provides 16 byte alignment.  But do *not*
  		   use skb_reserve() to align the IP header! */
! 		struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ);
  		tp->rx_buffers[i].skb = skb;
  		if (skb == NULL)
***************
*** 795,799 ****
  }
  
! static void tulip_release_unconsumed_tx_buffers(struct tulip_private *tp)
  {
  	unsigned int dirty_tx;
--- 795,799 ----
  }
  
! static void tulip_clean_tx_ring(struct tulip_private *tp)
  {
  	unsigned int dirty_tx;
***************
*** 804,811 ****
  		int status = le32_to_cpu(tp->tx_ring[entry].status);
  
! 		if (status > 0)
! 			break;		/* It has been Txed */
  
! 		/* Check for Rx filter setup frames. */
  		if (tp->tx_buffers[entry].skb == NULL) {
  			/* test because dummy frames not mapped */
--- 804,813 ----
  		int status = le32_to_cpu(tp->tx_ring[entry].status);
  
! 		if (status < 0) {
! 			tp->stats.tx_errors++;	/* It wasn't Txed */
! 			tp->tx_ring[entry].status = 0;
! 		}
  
! 		/* Check for Tx filter setup frames. */
  		if (tp->tx_buffers[entry].skb == NULL) {
  			/* test because dummy frames not mapped */
***************
*** 817,821 ****
  			continue;
  		}
- 		tp->stats.tx_errors++;
  
  		pci_unmap_single(tp->pdev, tp->tx_buffers[entry].mapping,
--- 819,822 ----
***************
*** 850,854 ****
  
  	/* release any unconsumed transmit buffers */
! 	tulip_release_unconsumed_tx_buffers(tp);
  
  	/* 21040 -- Leave the card in 10baseT state. */
--- 851,855 ----
  
  	/* release any unconsumed transmit buffers */
! 	tulip_clean_tx_ring(tp);
  
  	/* 21040 -- Leave the card in 10baseT state. */
***************
*** 1481,1487 ****
  		csr0 &= ~0xfff10000; /* zero reserved bits 31:20, 16 */
  
-        	if (chip_idx == DC21143  &&  chip_rev == 65)
-                	csr0 &= ~0x01000000;
- 
  	/*
  	 *	And back to business
--- 1482,1485 ----
***************
*** 1499,1503 ****
  	irq = pdev->irq;
  
! 	/* init_etherdev ensures aligned and zeroed private structures */
  	dev = alloc_etherdev (sizeof (*tp));
  	if (!dev) {
--- 1497,1501 ----
  	irq = pdev->irq;
  
! 	/* alloc_etherdev ensures aligned and zeroed private structures */
  	dev = alloc_etherdev (sizeof (*tp));
  	if (!dev) {
***************
*** 1539,1543 ****
  	/*
  	 * initialize private data structure 'tp'
! 	 * it is zeroed and aligned in init_etherdev
  	 */
  	tp = dev->priv;
--- 1537,1541 ----
  	/*
  	 * initialize private data structure 'tp'
! 	 * it is zeroed and aligned in alloc_etherdev
  	 */
  	tp = dev->priv;