Commit dde1ec5b authored by Chas Williams's avatar Chas Williams Committed by Linus Torvalds

[ATM]: [nicstar] use kernel min/max (by Randy.Dunlap <rddunlap@osdl.org>)

parent f8eecf9b
......@@ -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)
......@@ -2483,7 +2480,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
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++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment