Commit 77d0cab9 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

net: tcp: drop unused function argument from mptcp_incoming_options 



Since commit cfde141e ("mptcp: move option parsing into
mptcp_incoming_options()"), the 3rd function argument is no longer used.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a1a35529

include/net/mptcp.h

+2 −4
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ bool mptcp_synack_options(const struct request_sock *req, unsigned int *size, 
bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,

			       unsigned int *size, unsigned int remaining,

			       struct mptcp_out_options *opts);

void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb,

			    struct tcp_options_received *opt_rx);

void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb);



void mptcp_write_options(__be32 *ptr, struct mptcp_out_options *opts);
@@ -185,8 +184,7 @@ static inline bool mptcp_established_options(struct sock *sk, 
}



static inline void mptcp_incoming_options(struct sock *sk,

					  struct sk_buff *skb,

					  struct tcp_options_received *opt_rx)

					  struct sk_buff *skb)

{

}

net/ipv4/tcp_input.c

+2 −2
Original line number Diff line number Diff line
@@ -4908,7 +4908,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) 
	int eaten;



	if (sk_is_mptcp(sk))

		mptcp_incoming_options(sk, skb, &tp->rx_opt);

		mptcp_incoming_options(sk, skb);



	if (TCP_SKB_CB(skb)->seq == TCP_SKB_CB(skb)->end_seq) {

		__kfree_skb(skb);
@@ -6489,7 +6489,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) 
	case TCP_LAST_ACK:

		if (!before(TCP_SKB_CB(skb)->seq, tp->rcv_nxt)) {

			if (sk_is_mptcp(sk))

				mptcp_incoming_options(sk, skb, &tp->rx_opt);

				mptcp_incoming_options(sk, skb);

			break;

		}

		fallthrough;

net/mptcp/options.c

+1 −2
Original line number Diff line number Diff line
@@ -859,8 +859,7 @@ static bool add_addr_hmac_valid(struct mptcp_sock *msk, 
	return hmac == mp_opt->ahmac;

}



void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb,

			    struct tcp_options_received *opt_rx)

void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb)

{

	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);

	struct mptcp_sock *msk = mptcp_sk(subflow->conn);