From 04ddc33fdec456b6d9b6f772f9257a84346f5374 Mon Sep 17 00:00:00 2001
From: Jayachandran C <jchandra@digeo.com>
Date: Thu, 13 Oct 2005 11:43:02 -0700
Subject: [PATCH] --- yaml --- r: 10175 b: refs/heads/master c:
 0d0d2bba97cb091218ea0bcb3d8debcc7bf48397 h: refs/heads/master i:   10173:
 e60ad10295689ce6bb130e7c41adb9df9ecace17   10171:
 b13e4d005e2f203e2762c966a039e13c72878ce3   10167:
 08ad6aab8a8c8573c1c950cb5ead2e74b2f8a5a5   10159:
 dcc831146a31c2640b8f86fecc3b7cea29b83b6d   10143:
 0f4204a746753c6803c9ae75592933628284117e   10111:
 20bc2320b66c6a1c63c3c22603401850ef4231ae v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/ip_output.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b466db6a17a4..052b68007778 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea7ce406490cb248f44f510f7c0bcc357184640a
+refs/heads/master: 0d0d2bba97cb091218ea0bcb3d8debcc7bf48397
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
index 1ad5202e556b..87e350069abb 100644
--- a/trunk/net/ipv4/ip_output.c
+++ b/trunk/net/ipv4/ip_output.c
@@ -1023,10 +1023,7 @@ ssize_t	ip_append_page(struct sock *sk, struct page *page,
 			int alloclen;
 
 			skb_prev = skb;
-			if (skb_prev)
-				fraggap = skb_prev->len - maxfraglen;
-			else
-				fraggap = 0;
+			fraggap = skb_prev->len - maxfraglen;
 
 			alloclen = fragheaderlen + hh_len + fraggap + 15;
 			skb = sock_wmalloc(sk, alloclen, 1, sk->sk_allocation);