From owner-p4-projects@FreeBSD.ORG Wed Jul 18 08:21:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1B1516A402; Wed, 18 Jul 2007 08:21:33 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7775A16A400 for ; Wed, 18 Jul 2007 08:21:33 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6751013C442 for ; Wed, 18 Jul 2007 08:21:33 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6I8LXqw066285 for ; Wed, 18 Jul 2007 08:21:33 GMT (envelope-from chub@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6I8LXOo066281 for perforce@freebsd.org; Wed, 18 Jul 2007 08:21:33 GMT (envelope-from chub@FreeBSD.org) Date: Wed, 18 Jul 2007 08:21:33 GMT Message-Id: <200707180821.l6I8LXOo066281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chub@FreeBSD.org using -f From: Brian Chu To: Perforce Change Reviews Cc: Subject: PERFORCE change 123681 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jul 2007 08:21:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=123681 Change 123681 by chub@chub-msdosfs on 2007/07/18 08:21:07 Single file left from g4 integration. Affected files ... .. //depot/projects/soc2007/chub-msdosfs2/sys/netinet/sctp_cc_functions.c#2 integrate Differences ... ==== //depot/projects/soc2007/chub-msdosfs2/sys/netinet/sctp_cc_functions.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_cc_functions.c,v 1.1 2007/07/14 09:36:27 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_cc_functions.c,v 1.2 2007/07/17 20:58:25 rrs Exp $"); void sctp_set_initial_cc_param(struct sctp_tcb *stcb, struct sctp_nets *net) { @@ -235,7 +235,7 @@ * * Should we stop any running T3 timer here? */ - if (sctp_cmt_pf && ((net->dest_state & SCTP_ADDR_PF) == + if (sctp_cmt_on_off && sctp_cmt_pf && ((net->dest_state & SCTP_ADDR_PF) == SCTP_ADDR_PF)) { net->dest_state &= ~SCTP_ADDR_PF; net->cwnd = net->mtu * sctp_cmt_pf; @@ -724,7 +724,7 @@ * * Should we stop any running T3 timer here? */ - if (sctp_cmt_pf && ((net->dest_state & SCTP_ADDR_PF) == + if (sctp_cmt_on_off && sctp_cmt_pf && ((net->dest_state & SCTP_ADDR_PF) == SCTP_ADDR_PF)) { net->dest_state &= ~SCTP_ADDR_PF; net->cwnd = net->mtu * sctp_cmt_pf; @@ -1047,7 +1047,7 @@ static inline uint32_t htcp_cong_time(struct htcp *ca) { - return ticks - ca->last_cong; + return sctp_get_tick_count() - ca->last_cong; } static inline uint32_t @@ -1062,7 +1062,7 @@ ca->undo_last_cong = ca->last_cong; ca->undo_maxRTT = ca->maxRTT; ca->undo_old_maxB = ca->old_maxB; - ca->last_cong = ticks; + ca->last_cong = sctp_get_tick_count(); } #ifdef SCTP_NOT_USED @@ -1099,7 +1099,7 @@ static void measure_achieved_throughput(struct sctp_tcb *stcb, struct sctp_nets *net) { - uint32_t now = ticks; + uint32_t now = sctp_get_tick_count(); if (net->fast_retran_ip == 0) net->htcp_ca.bytes_acked = net->net_ack; @@ -1303,7 +1303,7 @@ net->htcp_ca.alpha = ALPHA_BASE; net->htcp_ca.beta = BETA_MIN; net->htcp_ca.bytes_acked = net->mtu; - net->htcp_ca.last_cong = ticks; + net->htcp_ca.last_cong = sctp_get_tick_count(); } void @@ -1419,7 +1419,7 @@ * * Should we stop any running T3 timer here? */ - if (sctp_cmt_pf && ((net->dest_state & SCTP_ADDR_PF) == + if (sctp_cmt_on_off && sctp_cmt_pf && ((net->dest_state & SCTP_ADDR_PF) == SCTP_ADDR_PF)) { net->dest_state &= ~SCTP_ADDR_PF; net->cwnd = net->mtu * sctp_cmt_pf; @@ -1592,7 +1592,7 @@ old_cwnd = net->cwnd; sctp_chunk_output(inp, stcb, SCTP_OUTPUT_FROM_EARLY_FR_TMR); - net->htcp_ca.last_cong = ticks; + net->htcp_ca.last_cong = sctp_get_tick_count(); /* * make a small adjustment to cwnd and force to CA. */