Merge branch 'csb1725' into csb1725-bdt

[mv-sheeva.git] / net / ipv4 / tcp.c

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 0814199694854e534eb4ff12671e02313dced8e9..053d21ca2cd9ddc47661fdf62b2da20b60181331 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -806,7 +806,7 @@ new_segment:
                if (can_coalesce) {
                        skb_shinfo(skb)->frags[i - 1].size += copy;
                } else {
-                       get_page(page);
+                       net_get_page(page);
                        skb_fill_page_desc(skb, i, page, offset, copy);
                }
 
@@ -1015,7 +1015,7 @@ new_segment:
                                        goto new_segment;
                                } else if (page) {
                                        if (off == PAGE_SIZE) {
-                                               put_page(page);
+                                               net_put_page(page);
                                                TCP_PAGE(sk) = page = NULL;
                                                off = 0;
                                        }
@@ -1056,9 +1056,9 @@ new_segment:
                                } else {
                                        skb_fill_page_desc(skb, i, page, off, copy);
                                        if (TCP_PAGE(sk)) {
-                                               get_page(page);
+                                               net_get_page(page);
                                        } else if (off + copy < PAGE_SIZE) {
-                                               get_page(page);
+                                               net_get_page(page);
                                                TCP_PAGE(sk) = page;
                                        }
                                }
@@ -2246,7 +2246,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
                /* Values greater than interface MTU won't take effect. However
                 * at the point when this call is done we typically don't yet
                 * know which interface is going to be used */
-               if (val < 64 || val > MAX_TCP_WINDOW) {
+               if (val < TCP_MIN_MSS || val > MAX_TCP_WINDOW) {
                        err = -EINVAL;
                        break;
                }