Date: Thu, 6 Sep 2018 14:15:04 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338496 - head/sys/netinet Message-ID: <201809061415.w86EF4Rs003656@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Thu Sep 6 14:15:03 2018 New Revision: 338496 URL: https://svnweb.freebsd.org/changeset/base/338496 Log: Define sctp probes only when SCTP is configured. Otherwise the "depends_on provider" guard in sctp.d does not work as intended. Reported by: mjg Reviewed by: tuexen Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D17057 Modified: head/sys/netinet/in_kdtrace.c Modified: head/sys/netinet/in_kdtrace.c ============================================================================== --- head/sys/netinet/in_kdtrace.c Thu Sep 6 14:03:11 2018 (r338495) +++ head/sys/netinet/in_kdtrace.c Thu Sep 6 14:15:03 2018 (r338496) @@ -31,12 +31,16 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_sctp.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/sdt.h> SDT_PROVIDER_DEFINE(ip); +#ifdef SCTP SDT_PROVIDER_DEFINE(sctp); +#endif SDT_PROVIDER_DEFINE(tcp); SDT_PROVIDER_DEFINE(udp); SDT_PROVIDER_DEFINE(udplite); @@ -57,6 +61,7 @@ SDT_PROBE_DEFINE6_XLATE(ip, , , send, "struct ip *", "ipv4info_t *", "struct ip6_hdr *", "ipv6info_t *"); +#ifdef SCTP SDT_PROBE_DEFINE5_XLATE(sctp, , , receive, "void *", "pktinfo_t *", "struct sctp_tcb *", "csinfo_t *", @@ -78,6 +83,7 @@ SDT_PROBE_DEFINE6_XLATE(sctp, , , state__change, "struct sctp_tcb *", "sctpsinfo_t *", "void *", "void *", "int", "sctplsinfo_t *"); +#endif SDT_PROBE_DEFINE5_XLATE(tcp, , , accept__established, "void *", "pktinfo_t *",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809061415.w86EF4Rs003656>