diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-30 14:31:07 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-30 14:31:07 -0800 |
| commit | 05bee4737774881e027bfd9a8b5c40a7d68f6325 (patch) | |
| tree | 5fd32eb8fe345d2d30e85910beac241a4439e8cd /net/core | |
| parent | 80595d59ba9917227856e663da249c2276a8628d (diff) | |
| parent | 905db44087855e3c1709f538ecdc22fd149cadd8 (diff) | |
| download | linux-05bee4737774881e027bfd9a8b5c40a7d68f6325.tar.gz linux-05bee4737774881e027bfd9a8b5c40a7d68f6325.tar.bz2 linux-05bee4737774881e027bfd9a8b5c40a7d68f6325.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000/e1000_main.c
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/skbuff.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index d386f1082ebd..f20e758fe46b 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; } |