diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2008-06-20 21:58:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-20 21:58:02 -0700 |
| commit | 2645a3c3761ac25498db2e627271016c849c68e1 (patch) | |
| tree | bf9ef85b4aede7a1773af2971084911245385c2d /drivers/net/pppoe.c | |
| parent | f630e43a215a3129d0c1173cae0bce6ea4855cf7 (diff) | |
| download | linux-2645a3c3761ac25498db2e627271016c849c68e1.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net/pppoe.c')
| -rw-r--r-- | drivers/net/pppoe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index bafb69b6f7cb..fc6f4b8c64b3 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; |