From 800686e21be824f25c176685f2b14044a9491615 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Sat, 5 Jan 2013 21:31:18 +0000
Subject: [PATCH] --- yaml --- r: 349237 b: refs/heads/master c:
 82bda6195615891181115f579a480aa5001ce7e9 h: refs/heads/master i:   349235:
 c523b1bd7414e65ad3853b61dc127eae0eda2bad v: v3

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

diff --git a/[refs] b/[refs]
index 2cb380b203e7..2d87a6ff967e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b74aa930ef49a3c0d8e4c1987f89decac768fb2c
+refs/heads/master: 82bda6195615891181115f579a480aa5001ce7e9
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index 3ab989b0de42..f5dfdf7727c4 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -1706,20 +1706,6 @@ static bool spd_fill_page(struct splice_pipe_desc *spd,
 	return false;
 }
 
-static inline void __segment_seek(struct page **page, unsigned int *poff,
-				  unsigned int *plen, unsigned int off)
-{
-	unsigned long n;
-
-	*poff += off;
-	n = *poff / PAGE_SIZE;
-	if (n)
-		*page = nth_page(*page, n);
-
-	*poff = *poff % PAGE_SIZE;
-	*plen -= off;
-}
-
 static bool __splice_segment(struct page *page, unsigned int poff,
 			     unsigned int plen, unsigned int *off,
 			     unsigned int *len, struct sk_buff *skb,
@@ -1727,6 +1713,8 @@ static bool __splice_segment(struct page *page, unsigned int poff,
 			     struct sock *sk,
 			     struct pipe_inode_info *pipe)
 {
+	unsigned int flen;
+
 	if (!*len)
 		return true;
 
@@ -1737,24 +1725,16 @@ static bool __splice_segment(struct page *page, unsigned int poff,
 	}
 
 	/* ignore any bits we already processed */
-	if (*off) {
-		__segment_seek(&page, &poff, &plen, *off);
-		*off = 0;
-	}
-
-	do {
-		unsigned int flen = min(*len, plen);
+	poff += *off;
+	plen -= *off;
+	*off = 0;
 
-		/* the linear region may spread across several pages  */
-		flen = min_t(unsigned int, flen, PAGE_SIZE - poff);
+	flen = min(*len, plen);
 
-		if (spd_fill_page(spd, pipe, page, &flen, poff, skb, linear, sk))
-			return true;
-
-		__segment_seek(&page, &poff, &plen, flen);
-		*len -= flen;
+	if (spd_fill_page(spd, pipe, page, &flen, poff, skb, linear, sk))
+		return true;
 
-	} while (*len && plen);
+	*len -= flen;
 
 	return false;
 }