Commit cf4c6bf8 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files

[TCP]: struct *sock argument renamed: sp -> sk 



In general, TCP code uses "sk" for struct sock pointer.

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 886236c1

net/ipv4/tcp_ipv4.c

+11 −11
Original line number Diff line number Diff line
@@ -2293,13 +2293,13 @@ static void get_openreq4(struct sock *sk, struct request_sock *req, 
		req);

}



static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i)

static void get_tcp4_sock(struct sock *sk, char *tmpbuf, int i)

{

	int timer_active;

	unsigned long timer_expires;

	struct tcp_sock *tp = tcp_sk(sp);

	const struct inet_connection_sock *icsk = inet_csk(sp);

	struct inet_sock *inet = inet_sk(sp);

	struct tcp_sock *tp = tcp_sk(sk);

	const struct inet_connection_sock *icsk = inet_csk(sk);

	struct inet_sock *inet = inet_sk(sk);

	__be32 dest = inet->daddr;

	__be32 src = inet->rcv_saddr;

	__u16 destp = ntohs(inet->dport);
@@ -2311,9 +2311,9 @@ static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i) 
	} else if (icsk->icsk_pending == ICSK_TIME_PROBE0) {

		timer_active	= 4;

		timer_expires	= icsk->icsk_timeout;

	} else if (timer_pending(&sp->sk_timer)) {

	} else if (timer_pending(&sk->sk_timer)) {

		timer_active	= 2;

		timer_expires	= sp->sk_timer.expires;

		timer_expires	= sk->sk_timer.expires;

	} else {

		timer_active	= 0;

		timer_expires = jiffies;
@@ -2321,17 +2321,17 @@ static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i) 


	sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX "

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

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

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

		tp->write_seq - tp->snd_una,

		sp->sk_state == TCP_LISTEN ? sp->sk_ack_backlog :

		sk->sk_state == TCP_LISTEN ? sk->sk_ack_backlog :

					     (tp->rcv_nxt - tp->copied_seq),

		timer_active,

		jiffies_to_clock_t(timer_expires - jiffies),

		icsk->icsk_retransmits,

		sock_i_uid(sp),

		sock_i_uid(sk),

		icsk->icsk_probes_out,

		sock_i_ino(sp),

		atomic_read(&sp->sk_refcnt), sp,

		sock_i_ino(sk),

		atomic_read(&sk->sk_refcnt), sk,

		icsk->icsk_rto,

		icsk->icsk_ack.ato,

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