diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:54 -0400 |
| commit | 0ed368c71aa65cba8d349432bd4dab4a9a2eb39c (patch) | |
| tree | 7746534bafd57f6764bda8f26efc3929a4acf914 /drivers/net/pppoe.c | |
| parent | 7aaaec38fcd9ef3172e69f8c19f20113830a8498 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/kconfig
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, | |||
| 942 | m->msg_namelen = 0; | 942 | m->msg_namelen = 0; |
| 943 | 943 | ||
| 944 | if (skb) { | 944 | if (skb) { |
| 945 | total_len = min(total_len, skb->len); | 945 | total_len = min_t(size_t, total_len, skb->len); |
| 946 | error = skb_copy_datagram_iovec(skb, 0, m->msg_iov, total_len); | 946 | error = skb_copy_datagram_iovec(skb, 0, m->msg_iov, total_len); |
| 947 | if (error == 0) | 947 | if (error == 0) |
| 948 | error = total_len; | 948 | error = total_len; |