From nobody Wed Jun 14 21:22:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QhJKl208yz4djkM; Wed, 14 Jun 2023 21:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QhJKl0pL0z4FXv; Wed, 14 Jun 2023 21:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686777755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aa922OktGnqohhhx0T11g0WxlCzNulut03gjNlEeY7o=; b=uyxFlJWIc+NBZVuPHGKWB/oTuIo+JQ8VxIBx6viwY6810xoNB4YyUhvDVQmxZrItli7ANH sabqbCLhCSmbaXQqQi7XGZO9drkBcGOYzEWxI2AWE+5LwDIwZi/2yiaKgaGeFu0Ktsp4cR D0x7jp9GASIR4LNlahC/LyDZ5t52BG428txjcTTSaS/YftP9IjItlK8MmSrSIz/i3EW0Zf 57/ogugBMcCjhvb4likRFfDeyuvrBH2e57WoCFBS6v+LxzviD8SKG3td2yexFgSv3CqsT7 Ls2H2Rmc7fa1ZxWCMOmHLmVAyA0lq2ik4TK6dPM6/cOdkZx2QuIhOMizP8Ls0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686777755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aa922OktGnqohhhx0T11g0WxlCzNulut03gjNlEeY7o=; b=gYQvmANgk1CMT5yv/lgBISG65HdWY2chJ2PgeD5wBk6lO0AEFti0LQEKL5/t8A3WkuH5dJ KflacKKSB9taLGgKWRCp6dP2dN5n68ZiXCS2pR5nnBNKBUqTgdK1ffMRyCz0xnscV7MNvd hSy0cXgJOWBQR4ezyPMe3WJerU891Uji5X/o1Dag6Guq7H+ohj0Y1tmBI4Phwnaxff4EDV AMrMOJnWcL8gBbwT967p6xOj5NBkYnR7AvR9PMTuWi79Z7Lb44yI98af22nlcaW2YuqVze P5kBinV61ZUlY0KA7aJjteqa4YXYodF0+RHs5hlVxuAMDIoyAvoq1ruTl/oxWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686777755; a=rsa-sha256; cv=none; b=qD4yIfNXK2uSRwqWGm8xD0ULlSeOVrXzYtPWT3QA/Psmvd0+TarLDGXHcH3HhCe8jm3qPE L0JXbvqBMnJbdP3ut8A2BSz80o1FremAlqZ1njRG+ZsuhFRbqgQrgdGj+J1BokCofFHe7j B6MkvQfhqhwuwuXJuwTTGhEHa5hwYywCEWTm2yJnTgBfjEHhvrtCT+AZ0mE8ai9mkpdS1J fBZeGtyb0QHVt350QJgsH2eHji3Ttg1s+xsFcE2akl4KHFYLAYWnEXNgxrgePw/mb/a/eW w9DCImtv+Y39zuQg0W5KqROpfQLgcY4/6c8LsNVKi2hCTtxNnX3vroPLhxrkHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QhJKk720TzKj1; Wed, 14 Jun 2023 21:22:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35ELMYT5090369; Wed, 14 Jun 2023 21:22:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35ELMYCs090368; Wed, 14 Jun 2023 21:22:34 GMT (envelope-from git) Date: Wed, 14 Jun 2023 21:22:34 GMT Message-Id: <202306142122.35ELMYCs090368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 6eb2dbfa63e8 - main - tcp: add missing static keywords List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6eb2dbfa63e87a1cf624a44d97ebab9c9b63a474 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=6eb2dbfa63e87a1cf624a44d97ebab9c9b63a474 commit 6eb2dbfa63e87a1cf624a44d97ebab9c9b63a474 Author: Gleb Smirnoff AuthorDate: 2023-06-14 21:21:28 +0000 Commit: Gleb Smirnoff CommitDate: 2023-06-14 21:21:28 +0000 tcp: add missing static keywords Without them compilation with -O0 would produce kernel modules that depend on symbol that doesn't exist. --- sys/netinet/tcp_hpts.h | 2 +- sys/netinet/tcp_stacks/tcp_rack.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_hpts.h b/sys/netinet/tcp_hpts.h index 086669342bb8..6f4d40897563 100644 --- a/sys/netinet/tcp_hpts.h +++ b/sys/netinet/tcp_hpts.h @@ -192,7 +192,7 @@ tcp_tv_to_lusectick(const struct timeval *sv) extern int32_t tcp_min_hptsi_time; -__inline int32_t +static inline int32_t get_hpts_min_sleep_time(void) { return (tcp_min_hptsi_time + HPTS_TICKS_PER_SLOT); diff --git a/sys/netinet/tcp_stacks/tcp_rack.h b/sys/netinet/tcp_stacks/tcp_rack.h index ac9d759d0628..00906363437d 100644 --- a/sys/netinet/tcp_stacks/tcp_rack.h +++ b/sys/netinet/tcp_stacks/tcp_rack.h @@ -109,13 +109,13 @@ struct deferred_opt_list { * as well. */ -inline uint64_t +static inline uint64_t rack_to_usec_ts(struct timeval *tv) { return ((tv->tv_sec * HPTS_USEC_IN_SEC) + tv->tv_usec); } -inline uint32_t +static inline uint32_t rack_ts_to_msec(uint64_t ts) { return((uint32_t)(ts / HPTS_MSEC_IN_SEC));