From nobody Wed Jun 15 21:36:39 2022 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 2083D837362; Wed, 15 Jun 2022 21:36:40 +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 4LNdt00Ntdz4d8f; Wed, 15 Jun 2022 21:36:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655329000; 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=8Hq8Es4JQ5srQpteBKBZgUwJCvqOx2Wl24/kUmUq23k=; b=ZDS7q4JFFw8FCBzpiNqPRrq0ig4HbUWnhCxd7O34N0FV6dotWA7T5WVvoORx8s2sTn6XZD OxhUFHll3TanEE1My/f+7VChg7jNDS3lpbdCgzB+Iw3+FULZdN9IXze7nzSTWkIkZjviNk DXrmyVLoGGi8BZohklszWRL2I2fuTwEIDNwqESq86SrKzUIfNZdidfaoWumWVdGUbS4ZOJ MV50D3p16m/IozniHvgPCBugsSQrW+fMMLmms58B2IiStrwKHZccUsYWo8IAd6kEptBwTq lG9E/Oglw4mvMsqFfpbm/hWas5fRXTnnbvApuPwbw7sTt/v96UyryeVeEfKXeA== 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 E18AB25F74; Wed, 15 Jun 2022 21:36:39 +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 25FLadmZ072495; Wed, 15 Jun 2022 21:36:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25FLadpE072494; Wed, 15 Jun 2022 21:36:39 GMT (envelope-from git) Date: Wed, 15 Jun 2022 21:36:39 GMT Message-Id: <202206152136.25FLadpE072494@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: bf6c6162c763 - main - 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/main X-Git-Reftype: branch X-Git-Commit: bf6c6162c7631b361f81e89b8539154dd738e828 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655329000; 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=8Hq8Es4JQ5srQpteBKBZgUwJCvqOx2Wl24/kUmUq23k=; b=FBcv2uaP84hp39oz++7dzE4aYAgvBwXOTliBYcCVM8rkAZyh/fQxPRubaz1qFAMKtq4SuD DzM9MQj4SZ9uxWUn+j0/SM7voswHOHaKdVL9heLe97AywRo8es5YzzgVqnNawd1b4UhJEn NJK2IQQED0+fphJW2SXYEvEFXQbaJtYKxEcU+BaRh0Cy6ImIYHsdaC73s68yaGXBMnsvpa Ilnrmw6Vi9ogzo0qpAfvnKMLyRFiChWSn7u/iSllPfl+F3RBirfTYQDDk5oS4kiATcZeUk uR6T+pxYIE5QX7vebm3quM1n8K0vRpGE49F//9BB2l4Fe6z6eALSHVO6qfoeIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655329000; a=rsa-sha256; cv=none; b=JN2zqTmUcKtjPpCLnllz9Fd+orSNG1Xm2x4KqbbBuaYJGPcEtekGEinC3vb5rz1g0JG118 DCtqHlxVadPhKWpImusj1qc05dMm6+aliO7T48KhFqzvkcmn2DPqE4Wk8SG5ou5YjhfkaL Ny6Nqd/aDNyRdANRwNPECri/H0yfU2AQb0JfkknzCf1LJL4QOvp5GO+QXQ9R4OzcgzpqVq FmqqghY5ssRTcxxMCVh3neogvdqdBIb2MTCnMaMZPQBM11bzzPc66YZ0GVhEcqVc7T/jbM 3ynOhBjXYYWsoYjQjpEBUP4unVP+Wo+FqRqgGbtUnMh19nQ76L1x97gJfKWcyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bf6c6162c7631b361f81e89b8539154dd738e828 commit bf6c6162c7631b361f81e89b8539154dd738e828 Author: Michael Tuexen AuthorDate: 2022-06-15 21:28:54 +0000 Commit: Michael Tuexen CommitDate: 2022-06-15 21:28:54 +0000 tcp: fix TCPPCAP for kernels enabling VNET Reviewed by: rscheff MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D35503 --- 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. */