---

yaml --- r: 98365 b: refs/heads/master c: 2645a3c h: refs/heads/master i: 98363: 9c5454a v: v3
git-mirror · Jun 21, 2008 · f79468a · f79468a
1 parent 8ae4474
commit f79468a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f630e43a215a3129d0c1173cae0bce6ea4855cf7
+refs/heads/master: 2645a3c3761ac25498db2e627271016c849c68e1
diff --git a/trunk/drivers/net/pppoe.c b/trunk/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;