From 10217164e5b723fd0fa2c931c5fef693817c6329 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Wed, 18 Apr 2012 10:14:23 +0000 Subject: [PATCH] --- yaml --- r: 299566 b: refs/heads/master c: 22b4a4f22da4b39c6f7f679fd35f3d35c91bf851 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_output.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d7d9a6a4bb7b..589558c77d5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56fa9b16303b0a3bad88ff528c4d5ff54d8cdb47 +refs/heads/master: 22b4a4f22da4b39c6f7f679fd35f3d35c91bf851 diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c index 376b2cfbb685..7ac6423117ad 100644 --- a/trunk/net/ipv4/tcp_output.c +++ b/trunk/net/ipv4/tcp_output.c @@ -1096,6 +1096,7 @@ static void __pskb_trim_head(struct sk_buff *skb, int len) eat = min_t(int, len, skb_headlen(skb)); if (eat) { __skb_pull(skb, eat); + skb->avail_size -= eat; len -= eat; if (!len) return;