From nobody Wed Feb 1 23:24:00 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 4P6dKF0SC4z3cKjW; Wed, 1 Feb 2023 23:24:01 +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 4P6dKD73Hhz3JRh; Wed, 1 Feb 2023 23:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675293841; 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=EtZIIryvcJQVdudf6/IBtXzBGH2EtkiuO/+i57/9VBY=; b=BvJ5pR3kw7EZ72JFHXXj81ZC5d4HMc3V83BUtLbB99HwkmhjkHRI0bjeMEg7lkwJXXT0gy 8nm/0Olrwx153AOoXJDs5OMjK8MRUQPc7jrE8Oz9PoYAyMEcB5whTWv5YnClnj75n3MMMj WGae8mvvB0gbFNwEGcliy35+sJBxcBCbibd928Q+J86S0ShvbAWmnLzKx+t/qzvI6S9tWS 5UuBzpbU80cDSB4iEbuvcnBtrY9QzBhXGkLAB3Fs9LO6BsRG5+bidF2FTbsRPhqf+x/HBk dLx4BIgOQ2c9+YPwl59kcHlT7nqzLJ0yWBpSpk/VRAZ4aMJvVapMT/YfaqMQMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675293841; 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=EtZIIryvcJQVdudf6/IBtXzBGH2EtkiuO/+i57/9VBY=; b=mvN84kDOxHScCh55XcBlBjDIeJ+i5bFNLeTBHbGgX26AEGjzTTVFlhD8zFwvi8wQyJyu56 4Nnf5VpRuT6gaIGCJWVVZDOT3AKAsySPIYddTraIGnzMg5ZiVDC8FlNkwVhevYdFjirbpR PNtupzXQPN50HOG6mA6pwFzzMgHYDX/4RCgH/MOqmyfgsvZOy5TAZxSxiMbzt+5D0GIQlR zVrGMulN3Ao90G+2Z0sL4s3pjjmwC3YJToLaj7bHknSaNQrsgx/F6tYSuoqa9/hC6OZP7T py29HJDP1sCFExsszghq15zcNUuF1FB6vHX0gOBe/cp1FxXIkm47hLygzO47Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675293841; a=rsa-sha256; cv=none; b=sKbrctPFmecmDyM9n7rWkChGjWQ1hkK0EsUYswASx4mu6MxYqKkQpsRNM16tAXF4xSpbdr I35/gJx2rI75aIFQY6MF/AQesj2J0vIkqmhMGhv+zTMo31JvCKDC+AL2N7AqYLgmin7EqI Q3ED528kTO6nEtj9JrTse3tMU+FGGWjdYvJDyjNZU+2W6WsMm5uNvTGEVIUITovpZscF0n d85+tlWv8cvnlQV/JVbrLgHl6ZykI1bTTKFYUJ9gAECjGjYrGHiCfffKD0D4yeVpqJk0g+ cyOThswzQjX3Y6Wfb+iMjf+8dYl1bfm5VjWyNVHEb5SOt1WLi8YOQdavF60hFA== 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 4P6dKD66SvzXx0; Wed, 1 Feb 2023 23:24:00 +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 311NO04T061214; Wed, 1 Feb 2023 23:24:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NO092061213; Wed, 1 Feb 2023 23:24:00 GMT (envelope-from git) Date: Wed, 1 Feb 2023 23:24:00 GMT Message-Id: <202302012324.311NO092061213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: e178d8601b79 - stable/13 - tcp: fix TCPPCAP for kernels enabling VNET 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e178d8601b79639de137e8f3f31f5463330dfa91 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e178d8601b79639de137e8f3f31f5463330dfa91 commit e178d8601b79639de137e8f3f31f5463330dfa91 Author: Michael Tuexen AuthorDate: 2022-06-15 21:28:54 +0000 Commit: Michael Tuexen CommitDate: 2023-02-01 23:22:47 +0000 tcp: fix TCPPCAP for kernels enabling VNET Reviewed by: rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D35503 (cherry picked from commit bf6c6162c7631b361f81e89b8539154dd738e828) --- sys/netinet/tcp_pcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_pcap.c b/sys/netinet/tcp_pcap.c index b387faada0ab..1faa1500ec5a 100644 --- a/sys/netinet/tcp_pcap.c +++ b/sys/netinet/tcp_pcap.c @@ -75,7 +75,7 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcp_pcap_alloc_new_mbuf, VNET_DEFINE(int, tcp_pcap_packets) = 0; #define V_tcp_pcap_packets VNET(tcp_pcap_packets) SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcp_pcap_packets, - CTLFLAG_RW, &VNET_NAME(tcp_pcap_packets), 0, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_pcap_packets), 0, "Default number of packets saved per direction per TCPCB"); /* Initialize the values. */