xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: tcp: drop unused function argument from mptcp_incoming_options

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

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Westphal
2020-09-25 01:23:02 +02:00
committed by David S. Miller
parent a1a35529bd
commit 77d0cab939
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/net/mptcp.h
View File

@@ -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, bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,
unsigned int *size, unsigned int remaining, unsigned int *size, unsigned int remaining,
struct mptcp_out_options *opts); struct mptcp_out_options *opts);
void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb, void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb);
struct tcp_options_received *opt_rx);
void mptcp_write_options(__be32 *ptr, struct mptcp_out_options *opts); 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, static inline void mptcp_incoming_options(struct sock *sk,
struct sk_buff *skb, struct sk_buff *skb)
struct tcp_options_received *opt_rx)
{ {
} }

4
net/ipv4/tcp_input.c
View File

@@ -4908,7 +4908,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
int eaten; int eaten;
if (sk_is_mptcp(sk)) 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) { if (TCP_SKB_CB(skb)->seq == TCP_SKB_CB(skb)->end_seq) {
__kfree_skb(skb); __kfree_skb(skb);
@@ -6489,7 +6489,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)
case TCP_LAST_ACK: case TCP_LAST_ACK:
if (!before(TCP_SKB_CB(skb)->seq, tp->rcv_nxt)) { if (!before(TCP_SKB_CB(skb)->seq, tp->rcv_nxt)) {
if (sk_is_mptcp(sk)) if (sk_is_mptcp(sk))
mptcp_incoming_options(sk, skb, &tp->rx_opt); mptcp_incoming_options(sk, skb);
break; break;
} }
fallthrough; fallthrough;

3
net/mptcp/options.c
View File

@@ -859,8 +859,7 @@ static bool add_addr_hmac_valid(struct mptcp_sock *msk,
return hmac == mp_opt->ahmac; return hmac == mp_opt->ahmac;
} }
void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb, void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb)
struct tcp_options_received *opt_rx)
{ {
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
struct mptcp_sock *msk = mptcp_sk(subflow->conn); struct mptcp_sock *msk = mptcp_sk(subflow->conn);