patch-2.4.26 linux-2.4.26/drivers/atm/nicstar.c

• Lines: 19
• Date: 2004-04-14 06:05:29.000000000 -0700
• Orig file: linux-2.4.25/drivers/atm/nicstar.c
• Orig date: 2004-02-18 05:36:31.000000000 -0800

diff -urN linux-2.4.25/drivers/atm/nicstar.c linux-2.4.26/drivers/atm/nicstar.c
@@ -112,9 +112,6 @@
 
 /* Macros *********************************************************************/
 
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-
 #define CMD_BUSY(card) (readl((card)->membase + STAT) & NS_STAT_CMDBZ)
 
 #define NS_DELAY mdelay(1)
@@ -2472,7 +2469,7 @@
             for (j = 1; j < NS_SKB(iovb)->iovcnt; j++)
             {
                lb = (struct sk_buff *) iov->iov_base;
-               tocopy = MIN(remaining, iov->iov_len);
+               tocopy = min_t(int, remaining, iov->iov_len);
                memcpy(hb->tail, lb->data, tocopy);
                skb_put(hb, tocopy);
                iov++;