2 files changed, 3 insertions, 2 deletions

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 63e106605f28..953129d392d2 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -54,6 +54,7 @@
 #include <linux/major.h>
 #include <linux/root_dev.h>
 #include <linux/delay.h>
+#include <linux/nfs_fs.h>
 #include <net/arp.h>
 #include <net/ip.h>
 #include <net/ipconfig.h>
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index cbcc9fc47783..f3f0013a9580 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;