patch-2.4.9 linux/net/appletalk/ddp.c

• Lines: 27
• Date: Wed Aug 15 01:22:17 2001
• Orig file: v2.4.8/linux/net/appletalk/ddp.c
• Orig date: Thu Apr 12 12:11:39 2001

diff -u --recursive --new-file v2.4.8/linux/net/appletalk/ddp.c linux/net/appletalk/ddp.c
@@ -113,8 +113,6 @@
 struct datalink_proto *ddp_dl, *aarp_dl;
 static struct proto_ops atalk_dgram_ops;
 
-#define min(a,b)	(((a)<(b))?(a):(b))
-
 /**************************************************************************\
 *                                                                          *
 * Handlers for the socket list.                                            *
@@ -1392,7 +1390,7 @@
 
 	/* Trim buffer in case of stray trailing data */
 	origlen = skb->len;
-	skb_trim(skb, min(skb->len, ddphv.deh_len));
+	skb_trim(skb, min(unsigned int, skb->len, ddphv.deh_len));
 
 	/*
 	 * Size check to see if ddp->deh_len was crap
@@ -1457,7 +1455,7 @@
 		}
 
                 /* Fix up skb->len field */
-                skb_trim(skb, min(origlen, rt->dev->hard_header_len +
+                skb_trim(skb, min(unsigned int, origlen, rt->dev->hard_header_len +
 			ddp_dl->header_length + ddphv.deh_len));
 
 		/* Mend the byte order */