---

yaml --- r: 134429 b: refs/heads/master c: ce3dd39 h: refs/heads/master i: 134427: b154010 v: v3
git-mirror · Feb 13, 2009 · 1eb0f6b · 1eb0f6b
1 parent d7310bc
commit 1eb0f6b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51621fbdb1ea8709ab67170b54e71be6d9fa29ad
+refs/heads/master: ce3dd39595d9d64f4ba6ee8dd24c6269a3b56b6a
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
@@ -1412,8 +1412,13 @@ static inline int spd_fill_page(struct splice_pipe_desc *spd, struct page *page,
 static inline void __segment_seek(struct page **page, unsigned int *poff,
 				  unsigned int *plen, unsigned int off)
 {
+	unsigned long n;
+
 	*poff += off;
-	*page += *poff / PAGE_SIZE;
+	n = *poff / PAGE_SIZE;
+	if (n)
+		*page = nth_page(*page, n);
+
 	*poff = *poff % PAGE_SIZE;
 	*plen -= off;
 }