Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

diff --git a/net/ipv4/tcp_dctcp.c b/net/ipv4/tcp_dctcp.c
index 7e538f71f5fbae087c3e3e4367d60e08cd609ac5..10d728b6804c259e459cc81a82e5c961839cc578 100644 (file)
--- a/net/ipv4/tcp_dctcp.c
+++ b/net/ipv4/tcp_dctcp.c
@@ -293,7 +293,7 @@ static size_t dctcp_get_info(struct sock *sk, u32 ext, int *attr,
         */
        if (ext & (1 << (INET_DIAG_DCTCPINFO - 1)) ||
            ext & (1 << (INET_DIAG_VEGASINFO - 1))) {
-               memset(info, 0, sizeof(struct tcp_dctcp_info));
+               memset(&info->dctcp, 0, sizeof(info->dctcp));
                if (inet_csk(sk)->icsk_ca_ops != &dctcp_reno) {
                        info->dctcp.dctcp_enabled = 1;
                        info->dctcp.dctcp_ce_state = (u16) ca->ce_state;
@@ -303,7 +303,7 @@ static size_t dctcp_get_info(struct sock *sk, u32 ext, int *attr,
                }
 
                *attr = INET_DIAG_DCTCPINFO;
-               return sizeof(*info);
+               return sizeof(info->dctcp);
        }
        return 0;
 }