patch-2.1.73 linux/drivers/net/3c505.c

• Lines: 36
• Date: Wed Dec 10 09:45:15 1997
• Orig file: v2.1.72/linux/drivers/net/3c505.c
• Orig date: Mon Nov 3 13:04:26 1997

diff -u --recursive --new-file v2.1.72/linux/drivers/net/3c505.c linux/drivers/net/3c505.c
@@ -323,7 +323,7 @@
  * never happen in theory, but seems to occur occasionally if the card gets
  * prodded at the wrong time.
  */
-static inline void check_dma(struct device *dev)
+static inline void check_3c505_dma(struct device *dev)
 {
 	elp_device *adapter = dev->priv;
 	if (adapter->dmaing && (jiffies > (adapter->current_dma.start_time + 10))) {
@@ -406,7 +406,7 @@
 	int timeout;
 	elp_device *adapter = dev->priv;
 
-	check_dma(dev);
+	check_3c505_dma(dev);
 
 	if (adapter->dmaing && adapter->current_dma.direction == 0)
 		return FALSE;
@@ -723,7 +723,7 @@
 			}
 		} else {
 			/* has one timed out? */
-			check_dma(dev);
+			check_3c505_dma(dev);
 		}
 
 		sti();
@@ -1088,7 +1088,7 @@
 		return 1;
 	}
 
-	check_dma(dev);
+	check_3c505_dma(dev);
 
 	/*
 	 * if the transmitter is still busy, we have a transmit timeout...