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

Commit 7be87351 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

tcp: /proc/net/tcp rto,ato values not scaled properly (v2) 



I found another case where we are sending information to userspace
in the wrong HZ scale.  This should have been fixed back in 2.5 :-(

This means an ABI change but as it stands there is no way for an application
like ss to get the right value.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c88e6f51

net/ipv4/tcp_ipv4.c

+3 −3
Original line number Diff line number Diff line
@@ -2291,7 +2291,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len) 
	}



	seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX "

			"%08X %5d %8d %lu %d %p %u %u %u %u %d%n",

			"%08X %5d %8d %lu %d %p %lu %lu %u %u %d%n",

		i, src, srcp, dest, destp, sk->sk_state,

		tp->write_seq - tp->snd_una,

		sk->sk_state == TCP_LISTEN ? sk->sk_ack_backlog :
@@ -2303,8 +2303,8 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len) 
		icsk->icsk_probes_out,

		sock_i_ino(sk),

		atomic_read(&sk->sk_refcnt), sk,

		icsk->icsk_rto,

		icsk->icsk_ack.ato,

		jiffies_to_clock_t(icsk->icsk_rto),

		jiffies_to_clock_t(icsk->icsk_ack.ato),

		(icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,

		tp->snd_cwnd,

		tp->snd_ssthresh >= 0xFFFF ? -1 : tp->snd_ssthresh,

net/ipv6/tcp_ipv6.c

+3 −3
Original line number Diff line number Diff line
@@ -2036,7 +2036,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) 


	seq_printf(seq,

		   "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "

		   "%02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %u %u %u %u %d\n",

		   "%02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %lu %lu %u %u %d\n",

		   i,

		   src->s6_addr32[0], src->s6_addr32[1],

		   src->s6_addr32[2], src->s6_addr32[3], srcp,
@@ -2052,8 +2052,8 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) 
		   icsk->icsk_probes_out,

		   sock_i_ino(sp),

		   atomic_read(&sp->sk_refcnt), sp,

		   icsk->icsk_rto,

		   icsk->icsk_ack.ato,

		   jiffies_to_clock_t(icsk->icsk_rto),

		   jiffies_to_clock_t(icsk->icsk_ack.ato),

		   (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,

		   tp->snd_cwnd, tp->snd_ssthresh>=0xFFFF?-1:tp->snd_ssthresh

		   );