From owner-svn-src-all@freebsd.org Sun Oct 13 16:14:05 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6CC70134FD0; Sun, 13 Oct 2019 16:14:05 +0000 (UTC) (envelope-from markj@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46rmwF2H1zz4Gny; Sun, 13 Oct 2019 16:14:05 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3234F1F636; Sun, 13 Oct 2019 16:14:05 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9DGE5Hq077008; Sun, 13 Oct 2019 16:14:05 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9DGE4ZB077005; Sun, 13 Oct 2019 16:14:04 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201910131614.x9DGE4ZB077005@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sun, 13 Oct 2019 16:14:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353477 - in head/sys: conf netinet X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head/sys: conf netinet X-SVN-Commit-Revision: 353477 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2019 16:14:05 -0000 Author: markj Date: Sun Oct 13 16:14:04 2019 New Revision: 353477 URL: https://svnweb.freebsd.org/changeset/base/353477 Log: Move SCTP DTrace probe definitions into a .c file. Previously they were defined in a header which was included exactly once. Change this to follow the usual practice of putting definitions in C files. No functional change intended. Discussed with: tuexen MFC after: 1 week Sponsored by: The FreeBSD Foundation Added: head/sys/netinet/sctp_kdtrace.c - copied, changed from r353476, head/sys/netinet/sctp_dtrace_define.h Deleted: head/sys/netinet/sctp_dtrace_define.h Modified: head/sys/conf/files head/sys/netinet/sctp_pcb.c Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sun Oct 13 15:57:09 2019 (r353476) +++ head/sys/conf/files Sun Oct 13 16:14:04 2019 (r353477) @@ -4258,6 +4258,7 @@ netinet/sctp_cc_functions.c optional inet sctp | inet6 netinet/sctp_crc32.c optional inet | inet6 netinet/sctp_indata.c optional inet sctp | inet6 sctp netinet/sctp_input.c optional inet sctp | inet6 sctp +netinet/sctp_kdtrace.c optional inet sctp | inet6 sctp netinet/sctp_output.c optional inet sctp | inet6 sctp netinet/sctp_pcb.c optional inet sctp | inet6 sctp netinet/sctp_peeloff.c optional inet sctp | inet6 sctp Copied and modified: head/sys/netinet/sctp_kdtrace.c (from r353476, head/sys/netinet/sctp_dtrace_define.h) ============================================================================== --- head/sys/netinet/sctp_dtrace_define.h Sun Oct 13 15:57:09 2019 (r353476, copy source) +++ head/sys/netinet/sctp_kdtrace.c Sun Oct 13 16:14:04 2019 (r353477) @@ -34,9 +34,7 @@ #include __FBSDID("$FreeBSD$"); -#ifndef _NETINET_SCTP_DTRACE_DEFINE_H_ -#define _NETINET_SCTP_DTRACE_DEFINE_H_ - +#include #include #include @@ -173,5 +171,3 @@ SDT_PROBE_DEFINE4(sctp, flightsize, assoc, val, * order. */ "int", /* The up/down amount */ "int"); /* The new value of the cwnd */ - -#endif Modified: head/sys/netinet/sctp_pcb.c ============================================================================== --- head/sys/netinet/sctp_pcb.c Sun Oct 13 15:57:09 2019 (r353476) +++ head/sys/netinet/sctp_pcb.c Sun Oct 13 16:14:04 2019 (r353477) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #if defined(INET) || defined(INET6) #include #endif