Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Jul 2020 18:34:09 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r363133 - head/sys/netinet
Message-ID:  <202007121834.06CIY9ri047592@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tuexen
Date: Sun Jul 12 18:34:09 2020
New Revision: 363133
URL: https://svnweb.freebsd.org/changeset/base/363133

Log:
  Cleanup, no functional change intended.
  
  This file is only compiled if INET or INET6 is defined. So there
  is no need for checking that.
  
  Reviewed by:		markj
  Differential Revision:	https://reviews.freebsd.org/D25635

Modified:
  head/sys/netinet/sctp_syscalls.c

Modified: head/sys/netinet/sctp_syscalls.c
==============================================================================
--- head/sys/netinet/sctp_syscalls.c	Sun Jul 12 17:16:57 2020	(r363132)
+++ head/sys/netinet/sctp_syscalls.c	Sun Jul 12 18:34:09 2020	(r363133)
@@ -32,8 +32,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_capsicum.h"
-#include "opt_inet.h"
-#include "opt_inet6.h"
 #include "opt_sctp.h"
 #include "opt_ktrace.h"
 
@@ -139,8 +137,6 @@ sctp_syscalls_uninit(void)
 
 /*
  * SCTP syscalls.
- * Functionality only compiled in if SCTP is defined in the kernel Makefile,
- * otherwise all return EOPNOTSUPP.
  */
 int
 sys_sctp_peeloff(td, uap)
@@ -150,7 +146,6 @@ sys_sctp_peeloff(td, uap)
 		caddr_t	name;
 	} */ *uap;
 {
-#if defined(INET) || defined(INET6)
 	struct file *headfp, *nfp = NULL;
 	struct socket *head, *so;
 	cap_rights_t rights;
@@ -212,7 +207,6 @@ done:
 	fdrop(headfp, td);
 done2:
 	return (error);
-#endif
 }
 
 int
@@ -228,7 +222,6 @@ sys_sctp_generic_sendmsg (td, uap)
 		int flags
 	} */ *uap;
 {
-#if defined(INET) || defined(INET6)
 	struct sctp_sndrcvinfo sinfo, *u_sinfo = NULL;
 	struct socket *so;
 	struct file *fp = NULL;
@@ -323,7 +316,6 @@ sctp_bad:
 sctp_bad2:
 	free(to, M_SONAME);
 	return (error);
-#endif
 }
 
 int
@@ -339,7 +331,6 @@ sys_sctp_generic_sendmsg_iov(td, uap)
 		int flags
 	} */ *uap;
 {
-#if defined(INET) || defined(INET6)
 	struct sctp_sndrcvinfo sinfo, *u_sinfo = NULL;
 	struct socket *so;
 	struct file *fp = NULL;
@@ -451,7 +442,6 @@ sctp_bad1:
 sctp_bad2:
 	free(to, M_SONAME);
 	return (error);
-#endif
 }
 
 int
@@ -467,7 +457,6 @@ sys_sctp_generic_recvmsg(td, uap)
 		int *msg_flags
 	} */ *uap;
 {
-#if defined(INET) || defined(INET6)
 	uint8_t sockbufstore[256];
 	struct uio auio;
 	struct iovec *iov, *tiov;
@@ -597,5 +586,4 @@ out1:
 		fdrop(fp, td);
 
 	return (error);
-#endif
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007121834.06CIY9ri047592>