diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:24:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:24:32 +0200 |
| commit | 5d641e7bbb8ed48f231bc902eecab2cc598f34a4 (patch) | |
| tree | 1be4ef1941355af508cc203838560a50707851bc /drivers/net/pppoe.c | |
| parent | 9ae76f5d8ab546660cf517bb63c64de51800955d (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into safe-poison-pointerstip-safe-poison-pointers-2008-06-25_10.24_Wed
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; |