Merge tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/net/ipv4/tcp_dctcp.c b/net/ipv4/tcp_dctcp.c
index b504371af74209362e03bbae0770bcbafc3e9340..4376016f7fa5cf84a3114d1551da623442c9c713 100644 (file)
--- a/net/ipv4/tcp_dctcp.c
+++ b/net/ipv4/tcp_dctcp.c
@@ -277,7 +277,7 @@ static void dctcp_cwnd_event(struct sock *sk, enum tcp_ca_event ev)
        }
 }
 
-static void dctcp_get_info(struct sock *sk, u32 ext, struct sk_buff *skb)
+static int dctcp_get_info(struct sock *sk, u32 ext, struct sk_buff *skb)
 {
        const struct dctcp *ca = inet_csk_ca(sk);
 
@@ -297,8 +297,9 @@ static void dctcp_get_info(struct sock *sk, u32 ext, struct sk_buff *skb)
                        info.dctcp_ab_tot = ca->acked_bytes_total;
                }
 
-               nla_put(skb, INET_DIAG_DCTCPINFO, sizeof(info), &info);
+               return nla_put(skb, INET_DIAG_DCTCPINFO, sizeof(info), &info);
        }
+       return 0;
 }
 
 static struct tcp_congestion_ops dctcp __read_mostly = {