diff options
| author | Linus Walleij <[email protected]> | 2013-12-09 13:04:37 +0000 |
|---|---|---|
| committer | Linus Walleij <[email protected]> | 2013-12-09 13:04:37 +0000 |
| commit | bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661 (patch) | |
| tree | da6e170ce87891a0242de88d8d7c1ba34faf9bb7 /net/ipv6/udp.c | |
| parent | Merge branch 'mark-irqs' into devel (diff) | |
| parent | Linux 3.13-rc3 (diff) | |
| download | kernel-bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661.tar.gz kernel-bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661.zip | |
Merge tag 'v3.13-rc3' into devel
Linux 3.13-rc3
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 81eb8cf8389b..bcd5699313c3 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -393,10 +393,10 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk, bool slow; if (flags & MSG_ERRQUEUE) - return ipv6_recv_error(sk, msg, len); + return ipv6_recv_error(sk, msg, len, addr_len); if (np->rxpmtu && np->rxopt.bits.rxpmtu) - return ipv6_recv_rxpmtu(sk, msg, len); + return ipv6_recv_rxpmtu(sk, msg, len, addr_len); try_again: skb = __skb_recv_datagram(sk, flags | (noblock ? MSG_DONTWAIT : 0), |