From nobody Sat Dec 04 14:34:34 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 DED6E18B7D0C; Sat, 4 Dec 2021 14:34:34 +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 4J5sf232ZDz3DYV; Sat, 4 Dec 2021 14:34:34 +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 49C2E25FA7; Sat, 4 Dec 2021 14:34:34 +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 1B4EYYEd077872; Sat, 4 Dec 2021 14:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B4EYYmo077871; Sat, 4 Dec 2021 14:34:34 GMT (envelope-from git) Date: Sat, 4 Dec 2021 14:34:34 GMT Message-Id: <202112041434.1B4EYYmo077871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 2d74fed5be52 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2d74fed5be523370345af10fdccd0b4fc8baa53e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638628474; 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=hZbLSuqsyM4Sm3e2npNHd8EX1GLdkjZu7/6NZfe5Gh4=; b=wdQ7uNG04n8C8BiO7Ge2h6l4z8HOTBBuBH0bodNlZ85EhJmS08EYkMkGioL/EIy8b5XiSC Zu2EwZEvt5R4p08bG/ZVgTG8msWF0Ah/zwd1BvtzfD4x/95+RgEDW89otzGCHNPGuioNEt ORuhwoCEQ9aKVReFlMsplrmWP8Rn23EnAuBmMUSr7T670xKZuiYDZk2mf2RMUYr4ZYUnjG n2uXojzLUXeiOhKGq0Mig8RZoL4TOnaRjtzhU5ChXVpbLzGnwnWW8zUB4e1TFkHYsu8pKJ 5A0Ph9jeWB82wwWN7Fl5SrRm4IEl4wqNtEHMR3sfi+d4K0Z97hHG5X5i2Pp5Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638628474; a=rsa-sha256; cv=none; b=RWjRvBEn4N1xHekCuG/rdNWN/nIqsJtAXzNv1n7oBriJh+7f6uT69uz8Ssm+0NDzbSeOCM qeH8eNxAbsvvQca+UhlhnJFac4TkEf6El9kmAFUrF37nV8yIKvzLwF1AFCEW8UuzDFzKIb lvajv/8COL97ZiFe7Y8hBo4XisEPxrR+6MhazXxgnYcfh5WMtep2AUFww/JYbc0VCGolvR QeeO1crLlyewLpBEQ1Qd8o2uDtQIhCFvOiPSieNxxkr8sm5WMk3sgkrDzlQqtV9mNNFcak LgbtWuKCeUO0RPwfL3OFRbMgvAjKpJDERRHexlAYEOYwq6fXuEueLT+h4gGPnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2d74fed5be523370345af10fdccd0b4fc8baa53e commit 2d74fed5be523370345af10fdccd0b4fc8baa53e Author: Cy Schubert AuthorDate: 2021-10-05 04:13:47 +0000 Commit: Cy Schubert CommitDate: 2021-12-04 14:33:12 +0000 ipfilter: Compat and simplify DTrace macro definitions Use a compound #if to simplify and compact DTn DTRACE_PROBEn macros used by ipfilter. MFC after: 3 days --- 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)