PERFORCE change 123681 for review
Brian Chu
chub at FreeBSD.org
Wed Jul 18 08:21:34 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=123681
Change 123681 by chub at 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 <netinet/sctp_asconf.h>
#include <netinet/sctp_cc_functions.h>
#include <sys/cdefs.h>
-__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.
*/
More information about the p4-projects
mailing list