| commit | 37fe4732b978eb02e5433387a40f2b61706cebe3 | |
| author | Herbert Xu <herbert@gondor.apana.org.au> | |
| Sat, 17 Jan 2009 19:48:13 +0000 (17 19:48 +0000) | ||
| committer | David S. Miller <davem@davemloft.net> | |
| Tue, 20 Jan 2009 22:44:03 +0000 (20 14:44 -0800) | ||
| tree | 476bd415def668118e0fa34a25ef2032e3ed14e7 | treesnapshot (tar.gz zip) |
| parent | 9a8e47ffd95608f0768e1a8a0225c822aa53aa9b | commitdiff |
gro: Fix merging of paged packets
The previous fix to paged packets broke the merging because it
reset the skb->len before we added it to the merged packet. This
wasn't detected because it simply resulted in the truncation of
the packet while the missing bit is subsequently retransmitted.
The fix is to store skb->len before we clobber it.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
The previous fix to paged packets broke the merging because it
reset the skb->len before we added it to the merged packet. This
wasn't detected because it simply resulted in the truncation of
the packet while the missing bit is subsequently retransmitted.
The fix is to store skb->len before we clobber it.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
| net/core/skbuff.c | diffblobblamehistory |