Commit ee7537b6 authored by Hantzis Fotis's avatar Hantzis Fotis Committed by David S. Miller
Browse files

tcp: tcp_init_wl / tcp_update_wl argument cleanup 



The above functions from include/net/tcp.h have been defined with an
argument that they never use. The argument is 'u32 ack' which is never
used inside the function body, and thus it can be removed. The rest of
the patch involves the necessary changes to the function callers of the
above two functions.

Signed-off-by: default avatarHantzis Fotis <xantzis@ceid.upatras.gr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1accad3

include/net/tcp.h

+2 −2
Original line number Diff line number Diff line
@@ -825,12 +825,12 @@ static inline void tcp_push_pending_frames(struct sock *sk) 
	__tcp_push_pending_frames(sk, tcp_current_mss(sk, 1), tp->nonagle);

}



static inline void tcp_init_wl(struct tcp_sock *tp, u32 ack, u32 seq)

static inline void tcp_init_wl(struct tcp_sock *tp, u32 seq)

{

	tp->snd_wl1 = seq;

}



static inline void tcp_update_wl(struct tcp_sock *tp, u32 ack, u32 seq)

static inline void tcp_update_wl(struct tcp_sock *tp, u32 seq)

{

	tp->snd_wl1 = seq;

}

net/ipv4/tcp_input.c

+4 −5
Original line number Diff line number Diff line
@@ -3416,7 +3416,7 @@ static int tcp_ack_update_window(struct sock *sk, struct sk_buff *skb, u32 ack, 


	if (tcp_may_update_window(tp, ack, ack_seq, nwin)) {

		flag |= FLAG_WIN_UPDATE;

		tcp_update_wl(tp, ack, ack_seq);

		tcp_update_wl(tp, ack_seq);



		if (tp->snd_wnd != nwin) {

			tp->snd_wnd = nwin;
@@ -3621,7 +3621,7 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag) 
		 * No more checks are required.

		 * Note, we use the fact that SND.UNA>=SND.WL2.

		 */

		tcp_update_wl(tp, ack, ack_seq);

		tcp_update_wl(tp, ack_seq);

		tp->snd_una = ack;

		flag |= FLAG_WIN_UPDATE;
@@ -5418,7 +5418,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, 
		 * never scaled.

		 */

		tp->snd_wnd = ntohs(th->window);

		tcp_init_wl(tp, TCP_SKB_CB(skb)->ack_seq, TCP_SKB_CB(skb)->seq);

		tcp_init_wl(tp, TCP_SKB_CB(skb)->seq);



		if (!tp->rx_opt.wscale_ok) {

			tp->rx_opt.snd_wscale = tp->rx_opt.rcv_wscale = 0;
@@ -5679,8 +5679,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, 
				tp->snd_una = TCP_SKB_CB(skb)->ack_seq;

				tp->snd_wnd = ntohs(th->window) <<

					      tp->rx_opt.snd_wscale;

				tcp_init_wl(tp, TCP_SKB_CB(skb)->ack_seq,

					    TCP_SKB_CB(skb)->seq);

				tcp_init_wl(tp, TCP_SKB_CB(skb)->seq);



				/* tcp_ack considers this ACK as duplicate

				 * and does not calculate rtt.

net/ipv4/tcp_minisocks.c

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req, 


		tcp_prequeue_init(newtp);



		tcp_init_wl(newtp, treq->snt_isn, treq->rcv_isn);

		tcp_init_wl(newtp, treq->rcv_isn);



		newtp->srtt = 0;

		newtp->mdev = TCP_TIMEOUT_INIT;

net/ipv4/tcp_output.c

+1 −1
Original line number Diff line number Diff line
@@ -2337,7 +2337,7 @@ static void tcp_connect_init(struct sock *sk) 
	sk->sk_err = 0;

	sock_reset_flag(sk, SOCK_DONE);

	tp->snd_wnd = 0;

	tcp_init_wl(tp, tp->write_seq, 0);

	tcp_init_wl(tp, 0);

	tp->snd_una = tp->write_seq;

	tp->snd_sml = tp->write_seq;

	tp->snd_up = tp->write_seq;

CRA Git | Maintained and supported by SUSTech CRA and CCSE