diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-02 11:44:51 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-02 11:44:51 +0200 |
| commit | ea019fdf1a2aa4134ce90801f7b36680d0fbd785 (patch) | |
| tree | ab44af35ae3e75f7fe60391274aa8a0a09a15c15 /net/ipv4/tcp_output.c | |
| parent | 55a63d4da3b8850480a1c5b222f77c739e30e346 (diff) | |
| parent | 40bac28eb1e39f229a94ad72e2ca8cdeef3ba31a (diff) | |
Merge tag 'asoc-fix-v3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.9
A few more fixes here and there, including quite a few nasty driver
specific ones, but nothing that has a major general impact.
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index e2b4461074da..817fbb396bc8 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1298,7 +1298,6 @@ 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; |