From nobody Thu Dec 09 19:00:17 2021 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 A956318C85AC; Thu, 9 Dec 2021 19:00:18 +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 4J93JK5Tbqz4TmW; Thu, 9 Dec 2021 19:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 94A4D397B; Thu, 9 Dec 2021 19:00:17 +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 1B9J0Hth053932; Thu, 9 Dec 2021 19:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9J0Hxq053926; Thu, 9 Dec 2021 19:00:17 GMT (envelope-from git) Date: Thu, 9 Dec 2021 19:00:17 GMT Message-Id: <202112091900.1B9J0Hxq053926@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 9dd2698fe6b8 - stable/12 - ipfilter: Compat and simplify DTrace macro definitions 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 9dd2698fe6b8229cce602173a650f111696ab1b8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639076418; 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=XFFDWanzwPiSe7yKWUhT+NQUeKV85lUki3zfaj8a0Pk=; b=xI2o3VvnCc+6e14fUuOgmhy+sLCpJ7y+UGKTvQ3kGC68lqnN8ZgIo2q+gsBXYaCg/JMBH5 nT4lEvhjxb/xXCH4GsKg3S0IUKe/HTCmft39QoLR+1RrFx4+W5VG2I2UtJHgxdl1qtC4Vy uvmwVk2+SIyU3YoUh/UMQwCAWgzyBX2ohu71vj+qKSjIButxAmUlUbj1FXHQ86f/3CwERc mZmzQEau70Xz4GHyFnH7nYPHx7S/SsDHHD1tbaFeNR8cIOSkpBGEd+heYtuAcMiLLRUbv+ UyGzL6ViyUullK1GFyElTj3fdBmreJvqnnOLIkH82LZiPd+7zmwXUuby38tkAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639076418; a=rsa-sha256; cv=none; b=Rx8BtaT5q3sl0IgrtZ39hnbnriYHq83ErMHiyrKo9R2Pbs/Bzm6f+qaJrtfMBdLM/wv++s vzVEYudusOHyG19JLX1PAi1BHwye9py879O21nsZOdZ2U99QEIiHpwMnXBBEffj+vSJis2 agBlr6NBmxULCsu/1xOd4qjox1FCxtwNAaw8CZr54EGKF9Z7DqdoqTv8juISkwyfKTKwJx HjYobZWgSBM+tXnMpnlYjV3rrUPBhKZ6IZou9cIPUyWCAt9gu9MAwltG7K0+GalZVg+p+3 eoHXYu6bgDglXhvl3Dfkj0xb4+g5zK7LLaIs8dU5ApB3Mudo6h4dbfM/I2+QhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=9dd2698fe6b8229cce602173a650f111696ab1b8 commit 9dd2698fe6b8229cce602173a650f111696ab1b8 Author: Cy Schubert AuthorDate: 2021-10-05 04:13:47 +0000 Commit: Cy Schubert CommitDate: 2021-12-09 18:52:10 +0000 ipfilter: Compat and simplify DTrace macro definitions Use a compound #if to simplify and compact DTn DTRACE_PROBEn macros used by ipfilter. (cherry picked from commit 2d74fed5be523370345af10fdccd0b4fc8baa53e) --- sys/contrib/ipfilter/netinet/ip_compat.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h index 5c00f8d37e40..4c7c9af9badf 100644 --- a/sys/contrib/ipfilter/netinet/ip_compat.h +++ b/sys/contrib/ipfilter/netinet/ip_compat.h @@ -1221,8 +1221,7 @@ typedef struct tcpiphdr tcpiphdr_t; # define DPRINT(x) #endif -#ifdef DTRACE_PROBE -# ifdef _KERNEL +#if defined(DTRACE_PROBE) && defined(_KERNEL) # define DT(_n) DTRACE_PROBE(_n) # define DT1(_n,_a,_b) DTRACE_PROBE1(_n,_a,_b) # define DT2(_n,_a,_b,_c,_d) DTRACE_PROBE2(_n,_a,_b,_c,_d) @@ -1230,13 +1229,6 @@ typedef struct tcpiphdr tcpiphdr_t; DTRACE_PROBE3(_n,_a,_b,_c,_d,_e,_f) # define DT4(_n,_a,_b,_c,_d,_e,_f,_g,_h) \ DTRACE_PROBE4(_n,_a,_b,_c,_d,_e,_f,_g,_h) -# else -# define DT(_n) -# define DT1(_n,_a,_b) -# define DT2(_n,_a,_b,_c,_d) -# define DT3(_n,_a,_b,_c,_d,_e,_f) -# define DT4(_n,_a,_b,_c,_d,_e,_f,_g,_h) -# endif #else # define DT(_n) # define DT1(_n,_a,_b)