diff options
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 0ba74bbe7d30..f6793b4cc669 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -2293,13 +2293,13 @@ static void get_openreq4(struct sock *sk, struct request_sock *req, | |||
2293 | req); | 2293 | req); |
2294 | } | 2294 | } |
2295 | 2295 | ||
2296 | static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i) | 2296 | static void get_tcp4_sock(struct sock *sk, char *tmpbuf, int i) |
2297 | { | 2297 | { |
2298 | int timer_active; | 2298 | int timer_active; |
2299 | unsigned long timer_expires; | 2299 | unsigned long timer_expires; |
2300 | struct tcp_sock *tp = tcp_sk(sp); | 2300 | struct tcp_sock *tp = tcp_sk(sk); |
2301 | const struct inet_connection_sock *icsk = inet_csk(sp); | 2301 | const struct inet_connection_sock *icsk = inet_csk(sk); |
2302 | struct inet_sock *inet = inet_sk(sp); | 2302 | struct inet_sock *inet = inet_sk(sk); |
2303 | __be32 dest = inet->daddr; | 2303 | __be32 dest = inet->daddr; |
2304 | __be32 src = inet->rcv_saddr; | 2304 | __be32 src = inet->rcv_saddr; |
2305 | __u16 destp = ntohs(inet->dport); | 2305 | __u16 destp = ntohs(inet->dport); |
@@ -2311,9 +2311,9 @@ static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i) | |||
2311 | } else if (icsk->icsk_pending == ICSK_TIME_PROBE0) { | 2311 | } else if (icsk->icsk_pending == ICSK_TIME_PROBE0) { |
2312 | timer_active = 4; | 2312 | timer_active = 4; |
2313 | timer_expires = icsk->icsk_timeout; | 2313 | timer_expires = icsk->icsk_timeout; |
2314 | } else if (timer_pending(&sp->sk_timer)) { | 2314 | } else if (timer_pending(&sk->sk_timer)) { |
2315 | timer_active = 2; | 2315 | timer_active = 2; |
2316 | timer_expires = sp->sk_timer.expires; | 2316 | timer_expires = sk->sk_timer.expires; |
2317 | } else { | 2317 | } else { |
2318 | timer_active = 0; | 2318 | timer_active = 0; |
2319 | timer_expires = jiffies; | 2319 | timer_expires = jiffies; |
@@ -2321,17 +2321,17 @@ static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i) | |||
2321 | 2321 | ||
2322 | sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX " | 2322 | sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX " |
2323 | "%08X %5d %8d %lu %d %p %u %u %u %u %d", | 2323 | "%08X %5d %8d %lu %d %p %u %u %u %u %d", |
2324 | i, src, srcp, dest, destp, sp->sk_state, | 2324 | i, src, srcp, dest, destp, sk->sk_state, |
2325 | tp->write_seq - tp->snd_una, | 2325 | tp->write_seq - tp->snd_una, |
2326 | sp->sk_state == TCP_LISTEN ? sp->sk_ack_backlog : | 2326 | sk->sk_state == TCP_LISTEN ? sk->sk_ack_backlog : |
2327 | (tp->rcv_nxt - tp->copied_seq), | 2327 | (tp->rcv_nxt - tp->copied_seq), |
2328 | timer_active, | 2328 | timer_active, |
2329 | jiffies_to_clock_t(timer_expires - jiffies), | 2329 | jiffies_to_clock_t(timer_expires - jiffies), |
2330 | icsk->icsk_retransmits, | 2330 | icsk->icsk_retransmits, |
2331 | sock_i_uid(sp), | 2331 | sock_i_uid(sk), |
2332 | icsk->icsk_probes_out, | 2332 | icsk->icsk_probes_out, |
2333 | sock_i_ino(sp), | 2333 | sock_i_ino(sk), |
2334 | atomic_read(&sp->sk_refcnt), sp, | 2334 | atomic_read(&sk->sk_refcnt), sk, |
2335 | icsk->icsk_rto, | 2335 | icsk->icsk_rto, |
2336 | icsk->icsk_ack.ato, | 2336 | icsk->icsk_ack.ato, |
2337 | (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong, | 2337 | (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong, |