diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
| commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
| tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /net/core/skbuff.c | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index d31bb36ae0d..7cd1bc86d59 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -2744,8 +2744,12 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb) | |||
| 2744 | 2744 | ||
| 2745 | merge: | 2745 | merge: |
| 2746 | if (offset > headlen) { | 2746 | if (offset > headlen) { |
| 2747 | skbinfo->frags[0].page_offset += offset - headlen; | 2747 | unsigned int eat = offset - headlen; |
| 2748 | skbinfo->frags[0].size -= offset - headlen; | 2748 | |
| 2749 | skbinfo->frags[0].page_offset += eat; | ||
| 2750 | skbinfo->frags[0].size -= eat; | ||
| 2751 | skb->data_len -= eat; | ||
| 2752 | skb->len -= eat; | ||
| 2749 | offset = headlen; | 2753 | offset = headlen; |
| 2750 | } | 2754 | } |
| 2751 | 2755 | ||