diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-22 03:06:42 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-22 03:06:42 +0300 |
| commit | e2a7c34fb2856fd5306e307e170e3dde358d0dce (patch) | |
| tree | afeb300b04186b1a1f649b2cd8a401a75878297c /net/ipv6/udp.c | |
| parent | 7d3f0cd43feea1636dd7746f22fe8249b34d1b79 (diff) | |
| parent | 6470812e22261d2342ef1597be62e63a0423d691 (diff) | |
| download | linux-e2a7c34fb2856fd5306e307e170e3dde358d0dce.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 19afcaf4a22e..2a15f1bb6ef8 100644 --- 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; |