Messages in this thread Patch in this message | | | Date | Tue, 09 Nov 2010 08:40:45 -0800 (PST) | Subject | Re: [PATCH] net: replace min with min_t in pktgen_if_write | From | David Miller <> |
| |
From: Davidlohr Bueso <dave@gnu.org> Date: Tue, 09 Nov 2010 13:37:13 -0300
> From: Davidlohr Bueso <dave@gnu.org> > > This addresses the following compiler (gcc 4.4.5) warning: > > CC [M] net/core/pktgen.o > net/core/pktgen.c: In function ‘pktgen_if_write’: > net/core/pktgen.c:890: warning: comparison of distinct pointer types lacks a cast > > Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Already fixed in net-2.6:
commit 86c2c0a8a4965ae5cbc0ff97ed39a4472e8e9b23 Author: Dmitry Torokhov <dmitry.torokhov@gmail.com> Date: Sat Nov 6 20:11:38 2010 +0000
NET: pktgen - fix compile warning This should fix the following warning: net/core/pktgen.c: In function ‘pktgen_if_write’: net/core/pktgen.c:890: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Reviewed-by: Nelson Elhage <nelhage@ksplice.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index fbce4b0..1992cd0 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -887,7 +887,7 @@ static ssize_t pktgen_if_write(struct file *file, i += len; if (debug) { - size_t copy = min(count, 1023); + size_t copy = min_t(size_t, count, 1023); char tb[copy + 1]; if (copy_from_user(tb, user_buffer, copy)) return -EFAULT; | |