From nobody Thu Dec 09 18:58:55 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 3EBBB18C6A37; Thu, 9 Dec 2021 18:58:56 +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 4J93Gl684Mz4TN7; Thu, 9 Dec 2021 18:58:55 +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 9B943424F; Thu, 9 Dec 2021 18:58:55 +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 1B9IwtwK046087; Thu, 9 Dec 2021 18:58:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9IwtjC046086; Thu, 9 Dec 2021 18:58:55 GMT (envelope-from git) Date: Thu, 9 Dec 2021 18:58:55 GMT Message-Id: <202112091858.1B9IwtjC046086@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: b993b91b05f1 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: b993b91b05f1f27d1a22705ea45cfb6f15f5997b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639076335; 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=gW9pogSrkPtB3JsBTXkyHJj05xLs39dF2Rl2ksX2guE=; b=KsK/ouAr72AyriLkzlT9GQxJ/mma2q7+r7VhA61gARoTgG4wjOfah9TFTHXs9SgAoI3no2 TGB6xKNzcfNmUszmPIkwsBUMjZn7aHtNVtUdXfjTaex4M1WDKKjH/GbKKjou3jUV2/cbK7 xySEtom6YDzLNgd9lARsrmtXoL9MW2mtM3/WpeLBuvaYy8KyZXaZz65iNg39c0aaRqIoS7 xmrUOosrzkGkF5eb2Dpi5koXB4n0JGQtn6sekDTh5oQufpJMpu8qNcakopl4gAdMIx/Ng1 Did5hWk6qCWjS04iFAtt9YYhTtMXzGITKho1dveurRyi54F1/o3XG+8Qbo+QfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639076335; a=rsa-sha256; cv=none; b=Ha+2+RAAW8U1kbZSeB5Ow7waQQ4n+G8pIyl0KjEUi16ENUisoZNddXX/8TbrsOJ4Qn2jB5 kQW8KtV3xTvbZuGxGqkywbNSvczmokSXaG2kImOfbBCvagKZOW2l6fNyyyYlnydfTt5wOX VJSieR80qb6RBDSZtmHiaEsz6yy9d4r5mGOnVGwkwkqsrXCt5aOjXVNxJ6UMV1MQhzluf5 TBmaN7jM1dnJNKqAcHl6UCn8aCQVLKO/jf8dkoKDPnYBsvQGNt/T1JY6rePrbKvRcdD2u8 AtjVKTuHTkP1InWjHNb5PzjwemA2vGcbyZVUtaq0UQmCzdRtWro1MhwKVGwLTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b993b91b05f1f27d1a22705ea45cfb6f15f5997b commit b993b91b05f1f27d1a22705ea45cfb6f15f5997b Author: Cy Schubert AuthorDate: 2021-10-05 04:13:47 +0000 Commit: Cy Schubert CommitDate: 2021-12-09 18:50:21 +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)