svn commit: r353477 - in head/sys: conf netinet

[Mark Johnston]

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 <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#ifndef _NETINET_SCTP_DTRACE_DEFINE_H_
-#define _NETINET_SCTP_DTRACE_DEFINE_H_
-
+#include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/sdt.h>
 
@@ -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 <netinet/sctp_output.h>
 #include <netinet/sctp_timer.h>
 #include <netinet/sctp_bsd_addr.h>
-#include <netinet/sctp_dtrace_define.h>
 #if defined(INET) || defined(INET6)
 #include <netinet/udp.h>
 #endif