patch-2.4.20 linux-2.4.20/drivers/net/pcmcia/xircom_tulip_cb.c
Next file: linux-2.4.20/drivers/net/pcnet32.c
Previous file: linux-2.4.20/drivers/net/pcmcia/xircom_cb.c
Back to the patch index
Back to the overall index
- Lines: 28
- Date:
Thu Nov 28 15:53:14 2002
- Orig file:
linux-2.4.19/drivers/net/pcmcia/xircom_tulip_cb.c
- Orig date:
Fri Aug 2 17:39:44 2002
diff -urN linux-2.4.19/drivers/net/pcmcia/xircom_tulip_cb.c linux-2.4.20/drivers/net/pcmcia/xircom_tulip_cb.c
@@ -355,7 +355,7 @@
const int strict_bits =
TxThresh10 | TxStoreForw | TxThreshMask | EnableTxRx | FullDuplexBit;
int csr5, csr5_22_20, csr5_19_17, currcsr6, attempts = 200;
- long flags;
+ unsigned long flags;
save_flags(flags);
cli();
/* mask out the reserved bits that always read 0 on the Xircom cards */
@@ -1105,9 +1105,6 @@
tp->stats.tx_errors++;
if (status & Tx0ManyColl) {
tp->stats.tx_aborted_errors++;
-#ifdef ETHER_STATS
- tp->stats.collisions16++;
-#endif
}
if (status & Tx0NoCarrier) tp->stats.tx_carrier_errors++;
if (status & Tx0LateColl) tp->stats.tx_window_errors++;
@@ -1464,7 +1461,7 @@
struct xircom_private *tp = dev->priv;
u16 *data = (u16 *)&rq->ifr_data;
int phy = tp->phys[0] & 0x1f;
- long flags;
+ unsigned long flags;
switch(cmd) {
case SIOCETHTOOL:
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)