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

• Lines: 17
• Date: Wed Aug 15 01:22:15 2001
• Orig file: v2.4.8/linux/drivers/net/dgrs.c
• Orig date: Tue Jul 3 17:08:20 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/net/dgrs.c linux/drivers/net/dgrs.c
@@ -693,7 +693,6 @@
 	I596_RBD	*rbdp;
 	int		count;
 	int		i, len, amt;
-#	define		mymin(A,B)	( (A) < (B) ? (A) : (B) )
 
 	/*
 	 *	Determine 0th priv and dev structure pointers
@@ -734,7 +733,7 @@
 			goto no_resources;
 		}
 
-		amt = mymin(len, rbdp->size - count);
+		amt = min(unsigned int, len, rbdp->size - count);
 		memcpy( (char *) S2H(rbdp->buf) + count, skb->data + i, amt);
 		i += amt;
 		count += amt;