diff --git a/[refs] b/[refs] index 2ed196c12f6c..13651bd19b9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32c90254ed4a0c698caa0794ebb4de63fcc69631 +refs/heads/master: 9cfaa8def1c795a512bc04f2aec333b03724ca2e diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c index abca870d8ff6..48cd88e62553 100644 --- a/trunk/net/ipv4/udp.c +++ b/trunk/net/ipv4/udp.c @@ -1249,6 +1249,9 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, if (noblock) return -EAGAIN; + + /* starting over for a new packet */ + msg->msg_flags &= ~MSG_TRUNC; goto try_again; } diff --git a/trunk/net/ipv6/udp.c b/trunk/net/ipv6/udp.c index 1e7a43f500ab..328985c40883 100644 --- a/trunk/net/ipv6/udp.c +++ b/trunk/net/ipv6/udp.c @@ -455,6 +455,9 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk, if (noblock) return -EAGAIN; + + /* starting over for a new packet */ + msg->msg_flags &= ~MSG_TRUNC; goto try_again; }