From f6210af20e0648c0caa344ab0d2ea2e4316f8582 Mon Sep 17 00:00:00 2001 From: YOSHIFUJI Hideaki Date: Fri, 14 Sep 2007 17:15:01 -0700 Subject: [PATCH] --- yaml --- r: 64989 b: refs/heads/master c: cd562c9859f648d78224e9fc0dafa5a3d5000fdb h: refs/heads/master i: 64987: 2f6b58546b6155c5099df85bcf3a8f85e5ce5516 v: v3 --- [refs] | 2 +- trunk/net/ipv6/udp.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1a4f7aa709ac..96ba294bf5b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ef9d943d26dea764f4fecf3767001c90b778b0c +refs/heads/master: cd562c9859f648d78224e9fc0dafa5a3d5000fdb diff --git a/trunk/net/ipv6/udp.c b/trunk/net/ipv6/udp.c index 4210951edb6e..c347f3e30e2e 100644 --- a/trunk/net/ipv6/udp.c +++ b/trunk/net/ipv6/udp.c @@ -555,6 +555,8 @@ static int udp_v6_push_pending_frames(struct sock *sk) out: up->len = 0; up->pending = 0; + if (!err) + UDP6_INC_STATS_USER(UDP_MIB_OUTDATAGRAMS, up->pcflag); return err; } @@ -823,10 +825,8 @@ int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk, release_sock(sk); out: fl6_sock_release(flowlabel); - if (!err) { - UDP6_INC_STATS_USER(UDP_MIB_OUTDATAGRAMS, is_udplite); + if (!err) return len; - } /* * ENOBUFS = no kernel mem, SOCK_NOSPACE = no sndbuf space. Reporting * ENOBUFS might not be good (it's not tunable per se), but otherwise