Merge tag 'fixes-for-v4.1-rc2' of https://github.com/rjarzmik/linux into fixes

[karo-tx-linux.git] / net / ipv4 / tcp_westwood.c

diff --git a/net/ipv4/tcp_westwood.c b/net/ipv4/tcp_westwood.c
index bb63fba47d47837b615c6bc6b730e36eead6328f..b3c57cceb9907fe9d79f33f33369a96b647b5f26 100644 (file)
--- a/net/ipv4/tcp_westwood.c
+++ b/net/ipv4/tcp_westwood.c
@@ -256,8 +256,7 @@ static void tcp_westwood_event(struct sock *sk, enum tcp_ca_event event)
 }
 
 /* Extract info for Tcp socket info provided via netlink. */
-static void tcp_westwood_info(struct sock *sk, u32 ext,
-                             struct sk_buff *skb)
+static int tcp_westwood_info(struct sock *sk, u32 ext, struct sk_buff *skb)
 {
        const struct westwood *ca = inet_csk_ca(sk);
 
@@ -268,8 +267,9 @@ static void tcp_westwood_info(struct sock *sk, u32 ext,
                        .tcpv_minrtt = jiffies_to_usecs(ca->rtt_min),
                };
 
-               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_westwood __read_mostly = {