[PATCH] fs: fix nobh data leak

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

diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c
index 1091671751c49187158f97d07dae8434ff3657ce..ce57bf302f6cc802493ae568966a401d45f9bbf3 100644 (file)
--- a/net/ipv4/tcp_veno.c
+++ b/net/ipv4/tcp_veno.c
@@ -9,7 +9,6 @@
  *     See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf
  */
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
@@ -199,17 +198,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,
@@ -220,7 +212,7 @@ static struct tcp_congestion_ops tcp_veno = {
 
 static int __init tcp_veno_register(void)
 {
-       BUG_ON(sizeof(struct veno) > ICSK_CA_PRIV_SIZE);
+       BUILD_BUG_ON(sizeof(struct veno) > ICSK_CA_PRIV_SIZE);
        tcp_register_congestion_control(&tcp_veno);
        return 0;
 }