From nobody Thu Feb 16 22:39:31 2023 X-Original-To: dev-commits-src-all@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 4PHqd01b8jz3qRm1; Thu, 16 Feb 2023 22:39:32 +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 4PHqd015LHz4HNB; Thu, 16 Feb 2023 22:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676587172; 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=4mTbJohBeJ0q5ss/RxJUlulpI2VNYtqh5pvXPVjOiEA=; b=ijJs981wO/LvjbuHXMx/QDSJek4D+Os1XbyWiRmSV9azVUaj5jPGNHc2VLTDGZUfEy+UVg +pnG+J16gJwQoWbkjIlhgnz8X6X3uBUyqcp2sgfVaxrVIpJ+/DMwIgY5bZXw77YtI58RwI EeU4Gfg6QZeM2vS05hUe/KtUXpkj8jGjVwm3o2sgNTpx/1sy8czZgnFGeTwdtbAPuy93Xu WJ/M9/hbwfxF2V+kGKhS/doF6SUlDqoePzqzLPvgM+7w5KpZFfljAYwE37qxdaNni/zRy9 /7KH++hraj+7xwmq/KcLP9/RqI2Pp95txRfVbX4FlJMyCxyfYXr1ptQjsvNq1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676587172; 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=4mTbJohBeJ0q5ss/RxJUlulpI2VNYtqh5pvXPVjOiEA=; b=ibZ75EZCji0HB4/WnT9ogIC/3ZSOOwh4bto9ES+L58/ZamrksvBTtO7Kn8EtWOSlNkCRsc 1OBDFoE/D85d2dbVZZFQRBEeO0uG4ClEJZXfk4WEAxFo/OI/wUDGfR+HerpgyPcBIfeDJV Poc7W/8zSN4Lhbi6zmdYG/r5xnt4bAxxZcji60HVXjvIZHEYOx3ecnO0q/2VCW947+f+WG W/QKENm86RI/rhHsCjhRc8mCfDblrh15S+rlcK7P8l5EBsUlgyFABTolyjafKyMVa0R5Df +3J6EeC/LdChaGt90+la7BrJGplpfxjyILT9fJqVP5hBN0FFkwgjq2rYDnWPgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676587172; a=rsa-sha256; cv=none; b=KvdrquC2Y7wO9EmKgTK/yZZBKecNDOZn+nGecHK8S8VMVcR4t42bKSqpZbe0sF/kPY9CRl 6rG2wq6GmN88GBUI/0QNysP/B396CHEf37Ls4lNXW7uqAIj0URx4LXuEQuJEguhayK46jd LTrDo3SxzqOTkUSm0vl/z3bKbYQ/TW0QWE3mCPDjK1iKWNegO2V8+RAiztzGmHHIhbVyXw Z0LKkoaOUNffVsjmyjys16b9nCMQWGQB4cD98BZm3lNzutM6shuTFFprDLRI1uX7B+1Ppa l9fglEbqmLZoJDO6p5v8aAF0ouA55Meqo/Y0Ur/pwThD5OiAL67fr4q0Fcct7Q== 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 4PHqcz71gnzLj3; Thu, 16 Feb 2023 22:39:31 +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 31GMdV6R074998; Thu, 16 Feb 2023 22:39:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GMdVEB074997; Thu, 16 Feb 2023 22:39:31 GMT (envelope-from git) Date: Thu, 16 Feb 2023 22:39:31 GMT Message-Id: <202302162239.31GMdVEB074997@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2ca516d1a670 - stable/13 - bridge: Make the ioctl table local to if_bridge.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2ca516d1a67025b1bda647d68cb863764f764305 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2ca516d1a67025b1bda647d68cb863764f764305 commit 2ca516d1a67025b1bda647d68cb863764f764305 Author: Mark Johnston AuthorDate: 2023-02-07 19:34:37 +0000 Commit: Mark Johnston CommitDate: 2023-02-16 21:55:25 +0000 bridge: Make the ioctl table local to if_bridge.c No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit 3bc099eb71200b843de94b8e84b30b152a38f2f4) --- sys/net/if_bridge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index e46c7fb92793..1d1e1cd20bc1 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -476,7 +476,7 @@ struct bridge_control { #define BC_F_COPYOUT 0x02 /* copy arguments out */ #define BC_F_SUSER 0x04 /* do super-user check */ -const struct bridge_control bridge_control_table[] = { +static const struct bridge_control bridge_control_table[] = { { bridge_ioctl_add, sizeof(struct ifbreq), BC_F_COPYIN|BC_F_SUSER }, { bridge_ioctl_del, sizeof(struct ifbreq), @@ -561,7 +561,7 @@ const struct bridge_control bridge_control_table[] = { BC_F_COPYIN|BC_F_SUSER }, }; -const int bridge_control_table_size = nitems(bridge_control_table); +static const int bridge_control_table_size = nitems(bridge_control_table); VNET_DEFINE_STATIC(LIST_HEAD(, bridge_softc), bridge_list); #define V_bridge_list VNET(bridge_list)