patch-2.4.9 linux/drivers/net/acenic.c

• Lines: 33
• Date: Wed Aug 15 01:22:15 2001
• Orig file: v2.4.8/linux/drivers/net/acenic.c
• Orig date: Wed Jul 25 17:10:21 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/net/acenic.c linux/drivers/net/acenic.c
@@ -157,10 +157,6 @@
 #define __devinit	__init
 #endif
 
-#ifndef min
-#define min(a,b)	(((a)<(b))?(a):(b))
-#endif
-
 #ifndef SMP_CACHE_BYTES
 #define SMP_CACHE_BYTES	L1_CACHE_BYTES
 #endif
@@ -2999,8 +2995,8 @@
 		return;
 
 	while (size > 0) {
-		tsize = min(((~dest & (ACE_WINDOW_SIZE - 1)) + 1),
-			    min(size, ACE_WINDOW_SIZE));
+		tsize = min(u32, ((~dest & (ACE_WINDOW_SIZE - 1)) + 1),
+			    min(u32, size, ACE_WINDOW_SIZE));
 		tdest = (unsigned long)&regs->Window +
 			(dest & (ACE_WINDOW_SIZE - 1));
 		writel(dest & ~(ACE_WINDOW_SIZE - 1), &regs->WinBase);
@@ -3030,8 +3026,8 @@
 		return;
 
 	while (size > 0) {
-		tsize = min(((~dest & (ACE_WINDOW_SIZE - 1)) + 1),
-			    min(size, ACE_WINDOW_SIZE));
+		tsize = min(u32, ((~dest & (ACE_WINDOW_SIZE - 1)) + 1),
+			    min(u32, size, ACE_WINDOW_SIZE));
 		tdest = (unsigned long)&regs->Window +
 			(dest & (ACE_WINDOW_SIZE - 1));
 		writel(dest & ~(ACE_WINDOW_SIZE - 1), &regs->WinBase);