pppoe: fix compiler warning

pppoe: fix compiler warning

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: x --]
[-- Type: text/plain, Size: 764 bytes --]

pppoe: fix compiler warning

Fix warning introduced by 392fdb0 (net pppoe: Check packet length on all receive paths):

drivers/net/pppoe.c: In function 'pppoe_recvmsg':
drivers/net/pppoe.c:945: warning: comparison of distinct pointer types lacks a cast

Signed-off-by: Patrick McHardy <kaber@trash.net>
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index bafb69b..fc6f4b8 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -942,7 +942,7 @@ static int pppoe_recvmsg(struct kiocb *iocb, struct socket *sock,
 	m->msg_namelen = 0;
 
 	if (skb) {
-		total_len = min(total_len, skb->len);
+		total_len = min_t(size_t, total_len, skb->len);
 		error = skb_copy_datagram_iovec(skb, 0, m->msg_iov, total_len);
 		if (error == 0)
 			error = total_len;

Re: pppoe: fix compiler warning

[Herbert Xu]

On Tue, Jun 24, 2008 at 06:00:06PM +0200, Patrick McHardy wrote:

> pppoe: fix compiler warning
> 
> Fix warning introduced by 392fdb0 (net pppoe: Check packet length on all receive paths):
> 
> drivers/net/pppoe.c: In function 'pppoe_recvmsg':
> drivers/net/pppoe.c:945: warning: comparison of distinct pointer types lacks a cast
> 
> Signed-off-by: Patrick McHardy <kaber@trash.net>

Acked-by: Herbert Xu <herbert@gondor.apana.org.au>

Thanks Patrick!
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: pppoe: fix compiler warning

[David Miller]

From: Patrick McHardy <kaber@trash.net>
Date: Tue, 24 Jun 2008 18:00:06 +0200

> pppoe: fix compiler warning
> 
> Fix warning introduced by 392fdb0 (net pppoe: Check packet length on all receive paths):
> 
> drivers/net/pppoe.c: In function 'pppoe_recvmsg':
> drivers/net/pppoe.c:945: warning: comparison of distinct pointer types lacks a cast
> 
> Signed-off-by: Patrick McHardy <kaber@trash.net>

Should already be fixed in net-2.6 by:

commit 2645a3c3761ac25498db2e627271016c849c68e1
Author: Stephen Hemminger <shemminger@vyatta.com>
Date:   Fri Jun 20 21:58:02 2008 -0700

    pppoe: warning fix
    
    Fix warning:
    drivers/net/pppoe.c: In function 'pppoe_recvmsg':
    drivers/net/pppoe.c:945: warning: comparison of distinct pointer types lacks a cast
    because skb->len is unsigned int and total_len is size_t
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index bafb69b..fc6f4b8 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -942,7 +942,7 @@ static int pppoe_recvmsg(struct kiocb *iocb, struct socket *sock,
 	m->msg_namelen = 0;
 
 	if (skb) {
-		total_len = min(total_len, skb->len);
+		total_len = min_t(size_t, total_len, skb->len);
 		error = skb_copy_datagram_iovec(skb, 0, m->msg_iov, total_len);
 		if (error == 0)
 			error = total_len;

Re: pppoe: fix compiler warning

[Patrick McHardy]

David Miller wrote:
> From: Patrick McHardy <kaber@trash.net>
> Date: Tue, 24 Jun 2008 18:00:06 +0200
> 
>> pppoe: fix compiler warning
>>
>> Fix warning introduced by 392fdb0 (net pppoe: Check packet length on all receive paths):
>>
>> drivers/net/pppoe.c: In function 'pppoe_recvmsg':
>> drivers/net/pppoe.c:945: warning: comparison of distinct pointer types lacks a cast
>>
>> Signed-off-by: Patrick McHardy <kaber@trash.net>
> 
> Should already be fixed in net-2.6 by:

My mistake, sorry :)