diff options
author | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
commit | 0ce49a3945474fc942ec37c0c0efece60f592f80 (patch) | |
tree | f42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /net/ipv6/udp.c | |
parent | 9e4859ef5462193643fd2b3c8ffb298e5a4a4319 (diff) | |
parent | a88a8eff1e6e32d3288986a9d36c6a449c032d3a (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/ipv6/udp.c')
-rw-r--r-- | net/ipv6/udp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 4210951edb6e..c347f3e30e2e 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
@@ -555,6 +555,8 @@ static int udp_v6_push_pending_frames(struct sock *sk) | |||
555 | out: | 555 | out: |
556 | up->len = 0; | 556 | up->len = 0; |
557 | up->pending = 0; | 557 | up->pending = 0; |
558 | if (!err) | ||
559 | UDP6_INC_STATS_USER(UDP_MIB_OUTDATAGRAMS, up->pcflag); | ||
558 | return err; | 560 | return err; |
559 | } | 561 | } |
560 | 562 | ||
@@ -823,10 +825,8 @@ do_append_data: | |||
823 | release_sock(sk); | 825 | release_sock(sk); |
824 | out: | 826 | out: |
825 | fl6_sock_release(flowlabel); | 827 | fl6_sock_release(flowlabel); |
826 | if (!err) { | 828 | if (!err) |
827 | UDP6_INC_STATS_USER(UDP_MIB_OUTDATAGRAMS, is_udplite); | ||
828 | return len; | 829 | return len; |
829 | } | ||
830 | /* | 830 | /* |
831 | * ENOBUFS = no kernel mem, SOCK_NOSPACE = no sndbuf space. Reporting | 831 | * ENOBUFS = no kernel mem, SOCK_NOSPACE = no sndbuf space. Reporting |
832 | * ENOBUFS might not be good (it's not tunable per se), but otherwise | 832 | * ENOBUFS might not be good (it's not tunable per se), but otherwise |