From 0e8646fdd263d9221cc57db4cc1db1cad1f12314 Mon Sep 17 00:00:00 2001 From: Thomas Chenault Date: Mon, 18 May 2009 21:43:27 -0700 Subject: [PATCH] --- yaml --- r: 145144 b: refs/heads/master c: 995b337952cdf7e05d288eede580257b632a8343 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/skbuff.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 38142135ebfe..8d59413d3beb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 511e11e396dc596825ce04d53d7f6d579404bc01 +refs/heads/master: 995b337952cdf7e05d288eede580257b632a8343 diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index d152394b2611..e505b5392e1e 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -2288,7 +2288,7 @@ unsigned int skb_seq_read(unsigned int consumed, const u8 **data, next_skb: block_limit = skb_headlen(st->cur_skb) + st->stepped_offset; - if (abs_offset < block_limit) { + if (abs_offset < block_limit && !st->frag_data) { *data = st->cur_skb->data + (abs_offset - st->stepped_offset); return block_limit - abs_offset; }