From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sat, 6 Nov 2010 20:11:38 +0000 (+0000)
Subject: NET: pktgen - fix compile warning
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=86c2c0a8a4965ae5cbc0ff97ed39a4472e8e9b23;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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 fbce4b05a53e..1992cd050e26 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;