path: root/drivers
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-21 08:44:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-21 08:44:08 -0700
commita19214430d27a3af6f1672ec26f3c893ef899ede (patch)
treeecd998eaf216f6e195c65cb050f4335db86b26f6 /drivers
parentb732d9680b7a2968823851f1163507ad9c45c8cb (diff)
parentb9f75f45a6b46a0ab4eb0857d437a0845871f314 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: netns: Don't receive new packets in a dead network namespace. sctp: Make sure N * sizeof(union sctp_addr) does not overflow. pppoe: warning fix ipv6: Drop packets for loopback address from outside of the box. ipv6: Remove options header when setsockopt's optlen is 0 mac80211: detect driver tx bugs
Diffstat (limited to 'drivers')
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;

Privacy Policy