Date: Sun, 1 Jul 2012 12:44:29 +0000 (UTC) From: Davide Italiano <davide@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r237922 - projects/calloutng/sys/netinet Message-ID: <201207011244.q61CiTAB002396@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: davide Date: Sun Jul 1 12:44:29 2012 New Revision: 237922 URL: http://svn.freebsd.org/changeset/base/237922 Log: The object that should be zeroed is *xtimer, not xtimer. No space is needed after cast. Modified: projects/calloutng/sys/netinet/tcp_timer.c Modified: projects/calloutng/sys/netinet/tcp_timer.c ============================================================================== --- projects/calloutng/sys/netinet/tcp_timer.c Sun Jul 1 12:34:19 2012 (r237921) +++ projects/calloutng/sys/netinet/tcp_timer.c Sun Jul 1 12:44:29 2012 (r237922) @@ -671,7 +671,7 @@ static int delta_bintime_in_msecs(struct bintime bt, struct bintime now) { bintime_sub(&bt, &now); - return (((uint64_t) 1000 * (uint64_t) (bt.frac >> 32)) >> 32) + + return (((uint64_t)1000 * (uint64_t)(bt.frac >> 32)) >> 32) + (bt.sec * 1000); } @@ -681,7 +681,7 @@ tcp_timer_to_xtimer(struct tcpcb *tp, st { struct bintime bt, now; - bzero(xtimer, sizeof(xtimer)); + bzero(xtimer, sizeof(*xtimer)); if (timer == NULL) return; bintime_clear(&bt);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207011244.q61CiTAB002396>