diff options
| author | Deepak Nibade <dnibade@nvidia.com> | 2014-03-10 20:06:24 +0530 |
|---|---|---|
| committer | Deepak Nibade <dnibade@nvidia.com> | 2014-03-10 20:06:24 +0530 |
| commit | 979bc71efd133d33922556c11af7bbec48734e53 (patch) | |
| tree | 7fb09746d84f9a68e9d8e4c9e1d1e871c6b17ec0 /net/ipv4/udp.c | |
| parent | af8ff60bcc47e0e7e97fc2a39fdee68f3340d23b (diff) | |
| parent | 243d4c9490e60a84e3812cad8786f23da374adac (diff) | |
Merge branch 'android-3.10' into dev-kernel-3.10
Bug 1456092
Change-Id: Idd03c5e52e7aac49f4adede54802ca66f22d2ee3
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 5ed9a7a09f04..fe1a3404314d 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1216,7 +1216,7 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, bool slow; if (flags & MSG_ERRQUEUE) - return ip_recv_error(sk, msg, len, addr_len); + return ip_recv_error(sk, msg, len); try_again: skb = __skb_recv_datagram(sk, flags | (noblock ? MSG_DONTWAIT : 0), |