diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-06 08:23:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-06 08:23:37 +0200 |
| commit | e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4 (patch) | |
| tree | 83c0e192ccaa4752c80b6131a7d0aa8272b5d0d0 /net/ipv4/udp.c | |
| parent | b44: Use pr_<level>_once and DRV_DESCRIPTION (diff) | |
| parent | net: vlan: enable soft features regardless of underlying device (diff) | |
| download | linux-e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4.tar.xz linux-e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 37aa9bf8d382..95e0d3b8977f 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1250,6 +1250,9 @@ csum_copy_err: if (noblock) return -EAGAIN; + + /* starting over for a new packet */ + msg->msg_flags &= ~MSG_TRUNC; goto try_again; } |