From c05eccd38ba36cfcd109b2a10e066e9031cfd67d Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 5 Sep 2005 18:55:48 -0700
Subject: [PATCH] --- yaml --- r: 7129 b: refs/heads/master c:
 fb5f5e6e0cebd574be737334671d1aa8f170d5f3 h: refs/heads/master i:   7127:
 4893215dc24656a5e07643abfe53b654ced512c4 v: v3

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

diff --git a/[refs] b/[refs]
index 74e050995b23..076fb6e90513 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1198ad002ad36291817c7bf0308ab9c50ee2571d
+refs/heads/master: fb5f5e6e0cebd574be737334671d1aa8f170d5f3
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index cbcc9fc47783..f3f0013a9580 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -769,10 +769,10 @@ int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 					if (off == PAGE_SIZE) {
 						put_page(page);
 						TCP_PAGE(sk) = page = NULL;
-						TCP_OFF(sk) = off = 0;
+						off = 0;
 					}
 				} else
-					BUG_ON(off);
+					off = 0;
 
 				if (copy > PAGE_SIZE - off)
 					copy = PAGE_SIZE - off;