patch-2.1.104 linux/drivers/net/tulip.c

• Lines: 30
• Date: Thu May 21 13:45:02 1998
• Orig file: v2.1.103/linux/drivers/net/tulip.c
• Orig date: Wed May 20 19:10:39 1998

diff -u --recursive --new-file v2.1.103/linux/drivers/net/tulip.c linux/drivers/net/tulip.c
@@ -42,9 +42,9 @@
 
 /* Set the copy breakpoint for the copy-only-tiny-buffer Rx structure. */
 #ifdef __alpha__
-static const rx_copybreak = 1518;
+static const int rx_copybreak = 1518;
 #else
-static const rx_copybreak = 100;
+static const int rx_copybreak = 100;
 #endif
 
 /* The following example shows how to always use the 10base2 port. */
@@ -578,7 +578,7 @@
 	/* Stop the chip's Tx and Rx processes. */
 	outl(inl(ioaddr + CSR6) & ~0x2002, ioaddr + CSR6);
 	/* Clear the missed-packet counter. */
-	(volatile)inl(ioaddr + CSR8);
+	(volatile int)inl(ioaddr + CSR8);
 
 	if (chip_id == DC21041) {
 		if (inl(ioaddr + CSR9) & 0x8000) {
@@ -804,7 +804,7 @@
 	/* The last media info list parsed, for multiport boards.  */
 	static struct mediatable *last_mediatable = NULL;
 	static unsigned char *last_ee_data = NULL;
-	static controller_index = 0;
+	static int controller_index = 0;
 	struct tulip_private *tp = (struct tulip_private *)dev->priv;
 	int ioaddr = dev->base_addr;
 	unsigned char *ee_data = tp->eeprom;