From 447cad745080541edebe571697aa3072d6d85f51 Mon Sep 17 00:00:00 2001
From: Shyam Iyer <shyam_iyer@dell.com>
Date: Thu, 29 Jan 2009 16:12:42 -0800
Subject: [PATCH] --- yaml --- r: 130493 b: refs/heads/master c:
 71b3346d182355f19509fadb8fe45114a35cc499 h: refs/heads/master i:   130491:
 a09c91220202e7057f6216b5f3b419d9a80da5d6 v: v3

---
 [refs]                  |  2 +-
 trunk/net/core/skbuff.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0dd67998bc6c..865fcec21e04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95e3b24cfb4ec0479d2c42f7a1780d68063a542a
+refs/heads/master: 71b3346d182355f19509fadb8fe45114a35cc499
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index f23fd43539ed..da74b844f4ea 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -2250,13 +2250,13 @@ unsigned int skb_seq_read(unsigned int consumed, const u8 **data,
 		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;
 	}