Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-08-21 17:06:42 -07:00
parent 7d3f0cd43f 6470812e22
commit e2a7c34fb2
199 changed files with 1218 additions and 655 deletions
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -366,7 +366,8 @@ int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
 		return ipv6_recv_rxpmtu(sk, msg, len, addr_len);

 try_again:
-	peeking = off = sk_peek_offset(sk, flags);
+	peeking = flags & MSG_PEEK;
+	off = sk_peek_offset(sk, flags);
 	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
 	if (!skb)
 		return err;