Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31ccd0e6 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp_westwood: fix tcp_westwood_info() 



I forgot to update tcp_westwood when changing get_info() behavior,
this patch should fix this.

Fixes: 64f40ff5 ("tcp: prepare CC get_info() access from getsockopt()")
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53ee1033

net/ipv4/tcp_westwood.c

+8 −7
Original line number Diff line number Diff line
@@ -256,18 +256,19 @@ static void tcp_westwood_event(struct sock *sk, enum tcp_ca_event event) 
}



/* Extract info for Tcp socket info provided via netlink. */

static int tcp_westwood_info(struct sock *sk, u32 ext, struct sk_buff *skb)

static size_t tcp_westwood_info(struct sock *sk, u32 ext, int *attr,

				union tcp_cc_info *info)

{

	const struct westwood *ca = inet_csk_ca(sk);



	if (ext & (1 << (INET_DIAG_VEGASINFO - 1))) {

		struct tcpvegas_info info = {

			.tcpv_enabled = 1,

			.tcpv_rtt = jiffies_to_usecs(ca->rtt),

			.tcpv_minrtt = jiffies_to_usecs(ca->rtt_min),

		};

		info->vegas.tcpv_enabled = 1;

		info->vegas.tcpv_rttcnt	= 0;

		info->vegas.tcpv_rtt	= jiffies_to_usecs(ca->rtt),

		info->vegas.tcpv_minrtt	= jiffies_to_usecs(ca->rtt_min),



		return nla_put(skb, INET_DIAG_VEGASINFO, sizeof(info), &info);

		*attr = INET_DIAG_VEGASINFO;

		return sizeof(struct tcpvegas_info);

	}

	return 0;

}