hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tcp: remove unused parameter of tcp_sacktag_bsearch() 

parameter state in the tcp_sacktag_bsearch() is not used.
So, it can be removed.

Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Taehee Yoo 2019-02-25 18:42:33 +09:00 committed by David S. Miller
parent 72636db5ba
commit 4bfabc46f8
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/ipv4/tcp_input.c
View File

@ -1574,9 +1574,7 @@ static struct sk_buff *tcp_sacktag_walk(struct sk_buff *skb, struct sock *sk,
return skb; return skb;
} }
static struct sk_buff *tcp_sacktag_bsearch(struct sock *sk, static struct sk_buff *tcp_sacktag_bsearch(struct sock *sk, u32 seq)
struct tcp_sacktag_state *state,
u32 seq)
{ {
struct rb_node *parent, **p = &sk->tcp_rtx_queue.rb_node; struct rb_node *parent, **p = &sk->tcp_rtx_queue.rb_node;
struct sk_buff *skb; struct sk_buff *skb;
@ -1598,13 +1596,12 @@ static struct sk_buff *tcp_sacktag_bsearch(struct sock *sk,
} }
static struct sk_buff *tcp_sacktag_skip(struct sk_buff *skb, struct sock *sk, static struct sk_buff *tcp_sacktag_skip(struct sk_buff *skb, struct sock *sk,
struct tcp_sacktag_state *state,
u32 skip_to_seq) u32 skip_to_seq)
{ {
if (skb && after(TCP_SKB_CB(skb)->seq, skip_to_seq)) if (skb && after(TCP_SKB_CB(skb)->seq, skip_to_seq))
return skb; return skb;
return tcp_sacktag_bsearch(sk, state, skip_to_seq); return tcp_sacktag_bsearch(sk, skip_to_seq);
} }
static struct sk_buff *tcp_maybe_skipping_dsack(struct sk_buff *skb, static struct sk_buff *tcp_maybe_skipping_dsack(struct sk_buff *skb,
@ -1617,7 +1614,7 @@ static struct sk_buff *tcp_maybe_skipping_dsack(struct sk_buff *skb,
return skb; return skb;
if (before(next_dup->start_seq, skip_to_seq)) { if (before(next_dup->start_seq, skip_to_seq)) {
skb = tcp_sacktag_skip(skb, sk, state, next_dup->start_seq); skb = tcp_sacktag_skip(skb, sk, next_dup->start_seq);
skb = tcp_sacktag_walk(skb, sk, NULL, state, skb = tcp_sacktag_walk(skb, sk, NULL, state,
next_dup->start_seq, next_dup->end_seq, next_dup->start_seq, next_dup->end_seq,
1); 1);
@ -1758,8 +1755,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb,
/* Head todo? */ /* Head todo? */
if (before(start_seq, cache->start_seq)) { if (before(start_seq, cache->start_seq)) {
skb = tcp_sacktag_skip(skb, sk, state, skb = tcp_sacktag_skip(skb, sk, start_seq);
start_seq);
skb = tcp_sacktag_walk(skb, sk, next_dup, skb = tcp_sacktag_walk(skb, sk, next_dup,
state, state,
start_seq, start_seq,
@ -1785,7 +1781,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb,
goto walk; goto walk;
} }
skb = tcp_sacktag_skip(skb, sk, state, cache->end_seq); skb = tcp_sacktag_skip(skb, sk, cache->end_seq);
/* Check overlap against next cached too (past this one already) */ /* Check overlap against next cached too (past this one already) */
cache++; cache++;
continue; continue;
@ -1796,7 +1792,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb,
if (!skb) if (!skb)
break; break;
} }
skb = tcp_sacktag_skip(skb, sk, state, start_seq); skb = tcp_sacktag_skip(skb, sk, start_seq);
walk: walk:
skb = tcp_sacktag_walk(skb, sk, next_dup, state, skb = tcp_sacktag_walk(skb, sk, next_dup, state,