X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=net%2Fipv4%2Ftcp.c;h=f3f0013a95804808d1522e89192b0beaefa91a30;hb=cc896f08717c445235554a7963a7b2ecf58911ad;hp=cbcc9fc4778365add8f53e6d63667d4ef6e74184;hpb=e766f1cc596078b1603ac2c96617660c4c7e2d81;p=powerpc.git

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index cbcc9fc477..f3f0013a95 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -769,10 +769,10 @@ new_segment:
 					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;