X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fpppoe.c;h=fc6f4b8c64b35cc169ab228c9c130b6ed0a4c821;hb=22ab019b6ff8f3f93ddc93135d7e7ff24d982fe0;hp=bafb69b6f7cbdeb26ea7975a2d46d2f04f7bdb24;hpb=a9653cf540d407fb75deb3db65a1be6c81d53ee0;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index bafb69b6f7c..fc6f4b8c64b 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;