From nobody Thu Jan 23 19:04:23 2025 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 4Yf9NR56wxz5lLLF; Thu, 23 Jan 2025 19:04:23 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yf9NR4TdHz4PCQ; Thu, 23 Jan 2025 19:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737659063; 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=WPCdrGD65jaFaBUAq55VOGBvj5iC1srI/68faIzLQeM=; b=l+jIoBZfLXecgO96caXvh0fChDbp1KnPL5E+XvoiY74pm9fwWLzkda9ysxd9VJ80pt36XX FSq675k2VqiDijunv2pHDe5ehntFomc/gD8LmLKRrmKS0mKobRfHYFpE5Leh+RPkx2iHwy ZSy0c0R3y3wkW9N5gTyomubIHQedSU5fB9CewWEE7zg+ZG/dhsHb2T9OzU5vBiDmpvLB2k jEKtX0QkDDYPARpAN2tVuQeSlFcRIWHEhpJLLpdgqQ4qvwakp/Q5TH/TGI2dD5NBQWFm4Z /aXlXAiEITuP09b6dbR3aDnuJ2Qy3FdBQ/Fzn+dMs3DDNKMtWo9XN64r5EtqSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737659063; 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=WPCdrGD65jaFaBUAq55VOGBvj5iC1srI/68faIzLQeM=; b=Yrvft9JSPox3TMstqzlF6auUiFsYvnvag9wJzzB4zeZRRwYKZrEmlVCZKe9RCMJ426g7Q8 xQy3WP/cWYRtpJAzayOz74hmEdLnviCahW8bVsXmj2pGoRVOBbsq3wLGP9Q5jVpj7SAqe4 aZeknzusWJetvcuE2iQ0rwKpN5NoRj/vA0q9+rZksLHzGKss8nIrq0ZdbE68sKvycSBPj9 w7kxuv0DOvZOUfv7wTlTvQ/1Vj7raLhQswnAy1RhNbGnls7C4291aVA3+B2S7GCjAg6lh0 XgYHc3YnvSFI1FjpX7Z/HsfWFmX73YHEeWCUfiFLNyXJtPDu7WzwUcKbc66B1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737659063; a=rsa-sha256; cv=none; b=Se+bHMhoJ9TlxuZQr3YE9qz1ZsgGD9lrTO7hBF7CfB86n/8+4N2LelOkaNMgWz1j0Uv0TA 1MIpYsPoJml+CuCArsO8Vdkwy6gJxNo/Jlx4e+lHsZ9hq65Ht2YNypXZUhIDBIdH2YAVp/ fAfGOxKBTcmDzPqiFtN4VJ22gCeG1qAZS1Qz0qP46V7gFNXjT8OWh6UmOkLpqI/SnuRkna wOlOceqjlUFPtF1G3CJEGQvp3wI5bQisj1nEiXQ3K/FBr9ueK1mbs/vA+HR3AyfAFvUDau ZwQaXSwKrVQudADOD0sm4z++/nXOdNzyRgsYtzDF7q/Kzj3z1QmvUP2qKFh9LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yf9NR3rPbzsJs; Thu, 23 Jan 2025 19:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50NJ4Ntt009992; Thu, 23 Jan 2025 19:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NJ4NIk009989; Thu, 23 Jan 2025 19:04:23 GMT (envelope-from git) Date: Thu, 23 Jan 2025 19:04:23 GMT Message-Id: <202501231904.50NJ4NIk009989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ce52baebd3b3 - main - icmp6: Fix ICMP6 message type counters 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: ce52baebd3b37044e8a8e3f64ea4bc64d52c0a52 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ce52baebd3b37044e8a8e3f64ea4bc64d52c0a52 commit ce52baebd3b37044e8a8e3f64ea4bc64d52c0a52 Author: Mark Johnston AuthorDate: 2025-01-23 19:03:25 +0000 Commit: Mark Johnston CommitDate: 2025-01-23 19:03:25 +0000 icmp6: Fix ICMP6 message type counters Previously this macro would always increment the first counter in the histogram array. PR: 279975 Fixes: 60d8dbbef075 ("netinet: add a probe point for IP, IP6, ICMP, ICMP6, UDP and TCP stats counters") Sponsored by: Klara, Inc. --- sys/netinet/icmp6.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h index 9de8daaa3390..7845b682f3e4 100644 --- a/sys/netinet/icmp6.h +++ b/sys/netinet/icmp6.h @@ -652,7 +652,7 @@ VNET_PCPUSTAT_DECLARE(struct icmp6stat, icmp6stat); #define ICMP6STAT_INC2(name, type) \ do { \ MIB_SDT_PROBE2(icmp6, count, name, 1, type); \ - VNET_PCPUSTAT_ADD(struct icmp6stat, icmp6stat, name, 1); \ + VNET_PCPUSTAT_ADD(struct icmp6stat, icmp6stat, name[type], 1); \ } while (0) /*