Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 8 insertions, 7 deletions

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 2e5f2ca3bdcd..da74b844f4ea 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2212,10 +2212,10 @@ unsigned int skb_seq_read(unsigned int consumed, const u8 **data,
                 return 0;
 
 next_skb:
-        block_limit = skb_headlen(st->cur_skb);
+        block_limit = skb_headlen(st->cur_skb) + st->stepped_offset;
 
         if (abs_offset < block_limit) {
-                *data = st->cur_skb->data + abs_offset;
+                *data = st->cur_skb->data + (abs_offset - st->stepped_offset);
                 return block_limit - abs_offset;
         }
 
@@ -2250,13 +2250,14 @@ next_skb:
                 st->frag_data = NULL;
         }
 
-        if (st->cur_skb->next) {
-                st->cur_skb = st->cur_skb->next;
+        if (st->root_skb == st->cur_skb &&
+            skb_shinfo(st->root_skb)->frag_list) {
+                st->cur_skb = skb_shinfo(st->root_skb)->frag_list;
                 st->frag_idx = 0;
                 goto next_skb;
-        } else if (st->root_skb == st->cur_skb &&
-                   skb_shinfo(st->root_skb)->frag_list) {
-                st->cur_skb = skb_shinfo(st->root_skb)->frag_list;
+        } else if (st->cur_skb->next) {
+                st->cur_skb = st->cur_skb->next;
+                st->frag_idx = 0;
                 goto next_skb;
         }