[NETNS]: Enable inetdev_event notifier.

[safe/jmp/linux-2.6] / net / ipv4 / tcp_timer.c

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 8f14808..803d758 100644 (file)
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -116,8 +116,6 @@ static int tcp_orphan_retries(struct sock *sk, int alive)
 
 static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk)
 {
-       int mss;
-
        /* Black hole detection */
        if (sysctl_tcp_mtu_probing) {
                if (!icsk->icsk_mtup.enabled) {
@@ -125,7 +123,9 @@ static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk)
                        tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
                } else {
                        struct tcp_sock *tp = tcp_sk(sk);
-                       mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low)/2;
+                       int mss;
+
+                       mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low) >> 1;
                        mss = min(sysctl_tcp_base_mss, mss);
                        mss = max(mss, 68 - tp->tcp_header_len);
                        icsk->icsk_mtup.search_low = tcp_mss_to_mtu(sk, mss);
@@ -186,7 +186,7 @@ static void tcp_delack_timer(unsigned long data)
                goto out_unlock;
        }
 
-       sk_stream_mem_reclaim(sk);
+       sk_mem_reclaim_partial(sk);
 
        if (sk->sk_state == TCP_CLOSE || !(icsk->icsk_ack.pending & ICSK_ACK_TIMER))
                goto out;
@@ -226,7 +226,7 @@ static void tcp_delack_timer(unsigned long data)
 
 out:
        if (tcp_memory_pressure)
-               sk_stream_mem_reclaim(sk);
+               sk_mem_reclaim(sk);
 out_unlock:
        bh_unlock_sock(sk);
        sock_put(sk);
@@ -420,7 +420,7 @@ static void tcp_write_timer(unsigned long data)
        TCP_CHECK_TIMER(sk);
 
 out:
-       sk_stream_mem_reclaim(sk);
+       sk_mem_reclaim(sk);
 out_unlock:
        bh_unlock_sock(sk);
        sock_put(sk);
@@ -514,7 +514,7 @@ static void tcp_keepalive_timer (unsigned long data)
        }
 
        TCP_CHECK_TIMER(sk);
-       sk_stream_mem_reclaim(sk);
+       sk_mem_reclaim(sk);
 
 resched:
        inet_csk_reset_keepalive_timer (sk, elapsed);