Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[linux-2.6-block.git] / net / ipv4 / tcp_illinois.c

diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c
index 1d5a30a90adf6194d3b2d2215276f52c0a3f4632..67476f085e4843dacaeb1b4d6b71ecc160c99b97 100644 (file)
--- a/net/ipv4/tcp_illinois.c
+++ b/net/ipv4/tcp_illinois.c
@@ -300,8 +300,7 @@ static u32 tcp_illinois_ssthresh(struct sock *sk)
 }
 
 /* Extract info for Tcp socket info provided via netlink. */
-static void tcp_illinois_info(struct sock *sk, u32 ext,
-                             struct sk_buff *skb)
+static int tcp_illinois_info(struct sock *sk, u32 ext, struct sk_buff *skb)
 {
        const struct illinois *ca = inet_csk_ca(sk);
 
@@ -318,8 +317,9 @@ static void tcp_illinois_info(struct sock *sk, u32 ext,
                        do_div(t, info.tcpv_rttcnt);
                        info.tcpv_rtt = t;
                }
-               nla_put(skb, INET_DIAG_VEGASINFO, sizeof(info), &info);
+               return nla_put(skb, INET_DIAG_VEGASINFO, sizeof(info), &info);
        }
+       return 0;
 }
 
 static struct tcp_congestion_ops tcp_illinois __read_mostly = {