diff options
| author | James Simmons <jsimmons@infradead.org> | 2012-11-14 18:15:32 +0000 |
|---|---|---|
| committer | James Simmons <jsimmons@infradead.org> | 2012-11-14 18:15:32 +0000 |
| commit | b44959f2817032bc4668434bbe1cf9ab28b8cb21 (patch) | |
| tree | de3bd861b36c836ac9b7b6e8dc179ca1985b6593 /net/ipv6/udp.c | |
| parent | e22956a2faa9cf34cec4a471131d50c6be75b0c2 (diff) | |
| parent | 2216c9e74fb3baac3cb73952158dbe38b703997e (diff) | |
Conflicts:
drivers/gpu/drm/tdfx/tdfx_drv.c
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index f05099fc590..07e2bfef684 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -48,6 +48,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> +#include <trace/events/skb.h> #include "udp_impl.h" int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) @@ -385,15 +386,27 @@ try_again: if (skb_csum_unnecessary(skb)) err = skb_copy_datagram_iovec(skb, sizeof(struct udphdr), - msg->msg_iov, copied ); + msg->msg_iov, copied); else { err = skb_copy_and_csum_datagram_iovec(skb, sizeof(struct udphdr), msg->msg_iov); if (err == -EINVAL) goto csum_copy_err; } - if (err) + if (unlikely(err)) { + trace_kfree_skb(skb, udpv6_recvmsg); + if (!peeked) { + atomic_inc(&sk->sk_drops); + if (is_udp4) + UDP_INC_STATS_USER(sock_net(sk), + UDP_MIB_INERRORS, + is_udplite); + else + UDP6_INC_STATS_USER(sock_net(sk), + UDP_MIB_INERRORS, + is_udplite); + } goto out_free; - + } if (!peeked) { if (is_udp4) UDP_INC_STATS_USER(sock_net(sk), @@ -479,6 +492,11 @@ void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt, if (sk == NULL) return; + if (type == ICMPV6_PKT_TOOBIG) + ip6_sk_update_pmtu(skb, sk, info); + if (type == NDISC_REDIRECT) + ip6_sk_redirect(skb, sk); + np = inet6_sk(sk); if (!icmpv6_err_convert(type, code, &err) && !np->recverr) |