lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[TCP]: No fackets_out/highest_sack tuning when SACK isn't enabled

Browse Source 
This was found due to bug report from Cedric Le Goater though
it turned this turned out to be unrelated bug.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ilpo Järvinen
2007-10-01 15:27:19 -07:00
committed by David S. Miller
parent 8336793baf
commit dc86967b54
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/ipv4/tcp_output.c
View File

@@ -660,7 +660,7 @@ static void tcp_set_skb_tso_segs(struct sock *sk, struct sk_buff *skb, unsigned
static void tcp_adjust_fackets_out(struct tcp_sock *tp, struct sk_buff *skb, static void tcp_adjust_fackets_out(struct tcp_sock *tp, struct sk_buff *skb,
int decr) int decr)
{ {
if (!tp->sacked_out) if (!tp->sacked_out || tcp_is_reno(tp))
return; return;
if (!before(tp->highest_sack, TCP_SKB_CB(skb)->seq)) if (!before(tp->highest_sack, TCP_SKB_CB(skb)->seq))
@@ -712,7 +712,8 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss
TCP_SKB_CB(buff)->end_seq = TCP_SKB_CB(skb)->end_seq; TCP_SKB_CB(buff)->end_seq = TCP_SKB_CB(skb)->end_seq;
TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(buff)->seq; TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(buff)->seq;
if (tp->sacked_out && (TCP_SKB_CB(skb)->seq == tp->highest_sack)) if (tcp_is_sack(tp) && tp->sacked_out &&
(TCP_SKB_CB(skb)->seq == tp->highest_sack))
tp->highest_sack = TCP_SKB_CB(buff)->seq; tp->highest_sack = TCP_SKB_CB(buff)->seq;
/* PSH and FIN should only be set in the second packet. */ /* PSH and FIN should only be set in the second packet. */
@@ -1718,7 +1719,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, int m
BUG_ON(tcp_skb_pcount(skb) != 1 || BUG_ON(tcp_skb_pcount(skb) != 1 ||
tcp_skb_pcount(next_skb) != 1); tcp_skb_pcount(next_skb) != 1);
if (WARN_ON(tp->sacked_out && if (WARN_ON(tcp_is_sack(tp) && tp->sacked_out &&
(TCP_SKB_CB(next_skb)->seq == tp->highest_sack))) (TCP_SKB_CB(next_skb)->seq == tp->highest_sack)))
return; return;