Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for...

[linux-2.6-omap-h63xx.git] / net / ipv4 / tcp_veno.c

diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c
index 1091671751c49187158f97d07dae8434ff3657ce..11b42a7135c19ef7241584752dd39be97c1bf444 100644 (file)
--- a/net/ipv4/tcp_veno.c
+++ b/net/ipv4/tcp_veno.c
@@ -199,17 +199,10 @@ static u32 tcp_veno_ssthresh(struct sock *sk)
                return max(tp->snd_cwnd >> 1U, 2U);
 }
 
-static u32 tcp_veno_min_cwnd(struct sock * sk)
-{
-       const struct tcp_sock *tp = tcp_sk(sk);
-       return tp->snd_ssthresh;
-}
-
 static struct tcp_congestion_ops tcp_veno = {
        .init           = tcp_veno_init,
        .ssthresh       = tcp_veno_ssthresh,
        .cong_avoid     = tcp_veno_cong_avoid,
-       .min_cwnd       = tcp_veno_min_cwnd,
        .rtt_sample     = tcp_veno_rtt_calc,
        .set_state      = tcp_veno_state,
        .cwnd_event     = tcp_veno_cwnd_event,