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

Next file: linux/drivers/net/aironet4500_card.c
Previous file: linux/drivers/net/Space.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/drivers/net/acenic.c linux/drivers/net/acenic.c
@@ -2995,8 +2995,8 @@
 		return;
 
 	while (size > 0) {
-		tsize = min(u32, ((~dest & (ACE_WINDOW_SIZE - 1)) + 1),
-			    min(u32, size, ACE_WINDOW_SIZE));
+		tsize = min_t(u32, ((~dest & (ACE_WINDOW_SIZE - 1)) + 1),
+			    min_t(u32, size, ACE_WINDOW_SIZE));
 		tdest = (unsigned long)&regs->Window +
 			(dest & (ACE_WINDOW_SIZE - 1));
 		writel(dest & ~(ACE_WINDOW_SIZE - 1), &regs->WinBase);
@@ -3026,8 +3026,8 @@
 		return;
 
 	while (size > 0) {
-		tsize = min(u32, ((~dest & (ACE_WINDOW_SIZE - 1)) + 1),
-			    min(u32, size, ACE_WINDOW_SIZE));
+		tsize = min_t(u32, ((~dest & (ACE_WINDOW_SIZE - 1)) + 1),
+			    min_t(u32, size, ACE_WINDOW_SIZE));
 		tdest = (unsigned long)&regs->Window +
 			(dest & (ACE_WINDOW_SIZE - 1));
 		writel(dest & ~(ACE_WINDOW_SIZE - 1), &regs->WinBase);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)