X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=net%2Fipv4%2Ftcp_bic.c;h=281c9f9132570afd83a7e11772d49771c8300d6c;hb=fabb5c4e4a474ff0f7d6c1d3466a1b79bbce5f49;hp=b0134ab0837945bb4b4082a3435bd3f845c49440;hpb=22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13;p=powerpc.git diff --git a/net/ipv4/tcp_bic.c b/net/ipv4/tcp_bic.c index b0134ab083..281c9f9132 100644 --- a/net/ipv4/tcp_bic.c +++ b/net/ipv4/tcp_bic.c @@ -206,7 +206,7 @@ static void bictcp_state(struct sock *sk, u8 new_state) /* Track delayed acknowledgment ratio using sliding window * ratio = (15*ratio + sample) / 16 */ -static void bictcp_acked(struct sock *sk, u32 cnt) +static void bictcp_acked(struct sock *sk, u32 cnt, ktime_t last) { const struct inet_connection_sock *icsk = inet_csk(sk); @@ -231,7 +231,7 @@ static struct tcp_congestion_ops bictcp = { static int __init bictcp_register(void) { - BUG_ON(sizeof(struct bictcp) > ICSK_CA_PRIV_SIZE); + BUILD_BUG_ON(sizeof(struct bictcp) > ICSK_CA_PRIV_SIZE); return tcp_register_congestion_control(&bictcp); }