openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tcp_westwood: fix tcp_westwood_info() 

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

Fixes: 64f40ff5bb ("tcp: prepare CC get_info() access from getsockopt()")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2015-04-29 16:20:58 -07:00 committed by David S. Miller
parent 9dac883544
commit f828ad0ce2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/ipv4/tcp_westwood.c
View File

@ -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. */ /* 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); const struct westwood *ca = inet_csk_ca(sk);
if (ext & (1 << (INET_DIAG_VEGASINFO - 1))) { if (ext & (1 << (INET_DIAG_VEGASINFO - 1))) {
struct tcpvegas_info info = { info->vegas.tcpv_enabled = 1;
.tcpv_enabled = 1, info->vegas.tcpv_rttcnt = 0;
.tcpv_rtt = jiffies_to_usecs(ca->rtt), info->vegas.tcpv_rtt = jiffies_to_usecs(ca->rtt),
.tcpv_minrtt = jiffies_to_usecs(ca->rtt_min), 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; return 0;
} }