diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-04-21 04:31:50 -0700 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2009-04-27 10:37:05 -0700 |
| commit | d6af2381754182d727fb4682e785f56ae8508210 (patch) | |
| tree | 80735e0ee70f2b416422ea381ad47c00c44d578f | |
| parent | 0702b646e5bdc16af64ef6f663e5275a02bf40cd (diff) | |
gso: Fix support for linear packets
upstream commit: 2f181855a0b3c2b39314944add7b41c15647cf86
When GRO/frag_list support was added to GSO, I made an error
which broke the support for segmenting linear GSO packets (GSO
packets are normally non-linear in the payload).
These days most of these packets are constructed by the tun
driver, which prefers to allocate linear memory if possible.
This is fixed in the latest kernel, but for 2.6.29 and earlier
it is still the norm.
Therefore this bug causes failures with GSO when used with tun
in 2.6.29.
Reported-by: James Huang <jamesclhuang@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index c6a6b166f8d..eae69549ccb 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2496,7 +2496,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features) skb_network_header_len(skb)); skb_copy_from_linear_data(skb, nskb->data, doffset); - if (pos >= offset + len) + if (fskb != skb_shinfo(skb)->frag_list) continue; if (!sg) { |