Commit 6c2bb0ef authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller

[TCP]: Fix tcp_trim_head() calculations.

Dave, we need to use the skb's MSS in trim_head as otherwise the
counters will be screwed up.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 11a79e83
...@@ -566,8 +566,6 @@ static unsigned char *__pskb_trim_head(struct sk_buff *skb, int len) ...@@ -566,8 +566,6 @@ static unsigned char *__pskb_trim_head(struct sk_buff *skb, int len)
int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len) int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len)
{ {
struct tcp_opt *tp = tcp_sk(sk);
if (skb_cloned(skb) && if (skb_cloned(skb) &&
pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
return -ENOMEM; return -ENOMEM;
...@@ -590,7 +588,7 @@ int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len) ...@@ -590,7 +588,7 @@ int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len)
/* Any change of skb->len requires recalculation of tso /* Any change of skb->len requires recalculation of tso
* factor and mss. * factor and mss.
*/ */
tcp_set_skb_tso_segs(skb, tp->mss_cache_std); tcp_set_skb_tso_segs(skb, tcp_skb_mss(skb));
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment