patch-2.4.5 linux/drivers/net/tulip/pnic.c

• Lines: 90
• Date: Sat May 19 18:02:45 2001
• Orig file: v2.4.4/linux/drivers/net/tulip/pnic.c
• Orig date: Tue Apr 3 10:19:43 2001

diff -u --recursive --new-file v2.4.4/linux/drivers/net/tulip/pnic.c linux/drivers/net/tulip/pnic.c
@@ -51,62 +51,6 @@
 	}
 }
 
-/* Modified version of tulip_check_duplex:
- * Always update the 100mbps bit, even if the
- * full duplex bit didn't change.
- *	Manfred Spraul <manfred@colorfullife.com>
- */
-int pnic_check_duplex(struct net_device *dev)
-{
-	struct tulip_private *tp = (struct tulip_private *)dev->priv;
-	int mii_reg1, mii_reg5, negotiated, duplex;
-	int new_csr6;
-
-	mii_reg1 = tulip_mdio_read(dev, tp->phys[0], 1);
-	mii_reg5 = tulip_mdio_read(dev, tp->phys[0], 5);
-	if (tulip_debug > 1)
-		printk(KERN_INFO "%s: MII status %4.4x, Link partner report "
-			   "%4.4x.\n", dev->name, mii_reg1, mii_reg5);
-	if (mii_reg1 == 0xffff)
-		return -2;
-	if ((mii_reg1 & 0x0004) == 0) {
-		int new_reg1 = tulip_mdio_read(dev, tp->phys[0], 1);
-		if ((new_reg1 & 0x0004) == 0) {
-			if (tulip_debug  > 1)
-				printk(KERN_INFO "%s: No link beat on the MII interface,"
-					   " status %4.4x.\n", dev->name, new_reg1);
-			return -1;
-		}
-	}
-	negotiated = mii_reg5 & tp->advertising[0];
-	/* 100baseTx-FD  or  10T-FD, but not 100-HD */
-	duplex = ((negotiated & 0x0300) == 0x0100
-			  || (negotiated & 0x00C0) == 0x0040) ||
-		tp->full_duplex_lock;
-
-	new_csr6 = tp->csr6;
-	if (negotiated & 0x0380)	/* 100mbps. */
-		new_csr6 &= ~0x00400000;
-	 else
-		new_csr6 |= 0x00400000;
-	if (duplex)
-		new_csr6 |= 0x0200;
-	 else	
-		new_csr6 &= ~0x0200;
-	if (new_csr6 != tp->csr6) {
-		tp->full_duplex = duplex;
-		tp->csr6 = new_csr6;
-		if (tulip_debug > 0)
-			printk(KERN_INFO "%s: Setting %s-duplex based on MII"
-				   "#%d link partner capability of %4.4x.\n",
-				   dev->name, tp->full_duplex ? "full" : "half",
-				   tp->phys[0], mii_reg5);
-		tulip_restart_rxtx(tp, tp->csr6);
-		return 1;
-	}
-	return 0;
-}
-
 void pnic_lnk_change(struct net_device *dev, int csr5)
 {
 	struct tulip_private *tp = (struct tulip_private *)dev->priv;
@@ -133,7 +77,7 @@
 	} else if (inl(ioaddr + CSR5) & TPLnkPass) {
 		if (tulip_media_cap[dev->if_port] & MediaIsMII) {
 			spin_lock(&tp->lock);
-			pnic_check_duplex(dev);
+			tulip_check_duplex(dev);
 			spin_unlock(&tp->lock);
 		} else {
 			pnic_do_nway(dev);
@@ -142,8 +86,6 @@
 	}
 }
 
-int tulip_refill_rx(struct net_device *dev);
-
 void pnic_timer(unsigned long data)
 {
 	struct net_device *dev = (struct net_device *)data;
@@ -162,7 +104,7 @@
 
 	if (tulip_media_cap[dev->if_port] & MediaIsMII) {
 		spin_lock_irq(&tp->lock);
-		if (pnic_check_duplex(dev) > 0)
+		if (tulip_check_duplex(dev) > 0)
 			next_tick = 3*HZ;
 		spin_unlock_irq(&tp->lock);
 	} else {