From owner-svn-src-projects@FreeBSD.ORG Sun Jul 1 12:44:30 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 070D01065672; Sun, 1 Jul 2012 12:44:30 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E6D218FC08; Sun, 1 Jul 2012 12:44:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q61CiTxg002398; Sun, 1 Jul 2012 12:44:29 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q61CiTAB002396; Sun, 1 Jul 2012 12:44:29 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201207011244.q61CiTAB002396@svn.freebsd.org> From: Davide Italiano Date: Sun, 1 Jul 2012 12:44:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237922 - projects/calloutng/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jul 2012 12:44:30 -0000 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);