patch-2.4.20 linux-2.4.20/drivers/net/winbond-840.c
Next file: linux-2.4.20/drivers/net/wireless/Config.in
Previous file: linux-2.4.20/drivers/net/wd.c
Back to the patch index
Back to the overall index
- Lines: 41
- Date:
Thu Nov 28 15:53:14 2002
- Orig file:
linux-2.4.19/drivers/net/winbond-840.c
- Orig date:
Fri Aug 2 17:39:44 2002
diff -urN linux-2.4.19/drivers/net/winbond-840.c linux-2.4.20/drivers/net/winbond-840.c
@@ -473,7 +473,7 @@
np->mii_if.full_duplex = 1;
if (np->mii_if.full_duplex)
- np->mii_if.duplex_lock = 1;
+ np->mii_if.force_media = 1;
/* The chip-specific entries in the device structure. */
dev->open = &netdev_open;
@@ -773,7 +773,7 @@
duplex = (negotiated & LPA_100FULL) || ((negotiated & 0x02C0) == LPA_10FULL);
fasteth = negotiated & 0x380;
}
- duplex |= np->mii_if.duplex_lock;
+ duplex |= np->mii_if.force_media;
/* remove fastether and fullduplex */
result = np->csr6 & ~0x20000200;
if (duplex)
@@ -1078,7 +1078,7 @@
np->tx_ring[entry].length |= DescEndRing;
/* Now acquire the irq spinlock.
- * The difficult race is the the ordering between
+ * The difficult race is the ordering between
* increasing np->cur_tx and setting DescOwn:
* - if np->cur_tx is increased first the interrupt
* handler could consider the packet as transmitted
@@ -1136,13 +1136,7 @@
if (tx_status & 0x0002) np->stats.tx_fifo_errors++;
if ((tx_status & 0x0080) && np->mii_if.full_duplex == 0)
np->stats.tx_heartbeat_errors++;
-#ifdef ETHER_STATS
- if (tx_status & 0x0100) np->stats.collisions16++;
-#endif
} else {
-#ifdef ETHER_STATS
- if (tx_status & 0x0001) np->stats.tx_deferred++;
-#endif
#ifndef final_version
if (debug > 3)
printk(KERN_DEBUG "%s: Transmit slot %d ok, Tx status %8.8x.\n",
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)