* [PATCH][ATM]: [nicstar] use kernel min/max (by "Randy.Dunlap" <rddunlap@osdl.org>)
@ 2004-03-24 23:12 chas williams (contractor)
2004-03-25 21:04 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: chas williams (contractor) @ 2004-03-24 23:12 UTC (permalink / raw)
To: davem; +Cc: netdev
please apply to the 2.6 and 2.4 kernels.
thanks!
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1673 -> 1.1674
# drivers/atm/nicstar.c 1.21 -> 1.22
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/03/24 chas@relax.cmf.nrl.navy.mil 1.1674
# [ATM]: [nicstar] use kernel min/max (by "Randy.Dunlap" <rddunlap@osdl.org>)
# --------------------------------------------
#
diff -Nru a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
--- a/drivers/atm/nicstar.c Wed Mar 24 15:17:23 2004
+++ b/drivers/atm/nicstar.c Wed Mar 24 15:17:23 2004
@@ -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 @@
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++;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH][ATM]: [nicstar] use kernel min/max (by "Randy.Dunlap" <rddunlap@osdl.org>)
2004-03-24 23:12 [PATCH][ATM]: [nicstar] use kernel min/max (by "Randy.Dunlap" <rddunlap@osdl.org>) chas williams (contractor)
@ 2004-03-25 21:04 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2004-03-25 21:04 UTC (permalink / raw)
To: chas3; +Cc: chas, netdev
On Wed, 24 Mar 2004 18:12:57 -0500
"chas williams (contractor)" <chas@cmf.nrl.navy.mil> wrote:
> please apply to the 2.6 and 2.4 kernels.
...
> # [ATM]: [nicstar] use kernel min/max (by "Randy.Dunlap" <rddunlap@osdl.org>)
Applied, thanks Chas/Randy.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-03-25 21:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-03-24 23:12 [PATCH][ATM]: [nicstar] use kernel min/max (by "Randy.Dunlap" <rddunlap@osdl.org>) chas williams (contractor)
2004-03-25 21:04 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).