---

yaml --- r: 130493 b: refs/heads/master c: 71b3346 h: refs/heads/master i: 130491: a09c912 v: v3
git-mirror · Jan 30, 2009 · 447cad7 · 447cad7
1 parent 5bda78f
commit 447cad7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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;
 	}