Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 0 insertions, 6 deletions

diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c
index 31a4986dfbf7..78b7a6b9e4de 100644
--- a/net/ipv4/tcp_cubic.c
+++ b/net/ipv4/tcp_cubic.c
@@ -325,11 +325,6 @@ static u32 bictcp_undo_cwnd(struct sock *sk)
         return max(tcp_sk(sk)->snd_cwnd, ca->last_max_cwnd);
 }
 
-static u32 bictcp_min_cwnd(struct sock *sk)
-{
-        return tcp_sk(sk)->snd_ssthresh;
-}
-
 static void bictcp_state(struct sock *sk, u8 new_state)
 {
         if (new_state == TCP_CA_Loss)
@@ -357,7 +352,6 @@ static struct tcp_congestion_ops cubictcp = {
         .cong_avoid     = bictcp_cong_avoid,
         .set_state      = bictcp_state,
         .undo_cwnd      = bictcp_undo_cwnd,
-        .min_cwnd       = bictcp_min_cwnd,
         .pkts_acked     = bictcp_acked,
         .owner          = THIS_MODULE,
         .name           = "cubic",