From 1eb0f6b9ae6cc26764a76ddcd31c5c4a62715efb Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Thu, 12 Feb 2009 16:51:43 -0800
Subject: [PATCH] --- yaml --- r: 134429 b: refs/heads/master c:
 ce3dd39595d9d64f4ba6ee8dd24c6269a3b56b6a h: refs/heads/master i:   134427:
 b154010b61e6e43d42f6ef3135fb69feb55c83d0 v: v3

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

diff --git a/[refs] b/[refs]
index bea303aeb1cf..df3e83dd62bd 100644
--- 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
index 7657cec5973d..ab7d2e9f02fa 100644
--- 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;
 }