Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Jun 2017 08:34:02 +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: r320260 - head/sys/netinet
Message-ID:  <201706230834.v5N8Y2RH012031@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tuexen
Date: Fri Jun 23 08:34:01 2017
New Revision: 320260
URL: https://svnweb.freebsd.org/changeset/base/320260

Log:
  Improve compilation on platforms different from FreeBSD.

Modified:
  head/sys/netinet/sctp_input.c
  head/sys/netinet/sctputil.c
  head/sys/netinet/sctputil.h

Modified: head/sys/netinet/sctp_input.c
==============================================================================
--- head/sys/netinet/sctp_input.c	Fri Jun 23 06:25:39 2017	(r320259)
+++ head/sys/netinet/sctp_input.c	Fri Jun 23 08:34:01 2017	(r320260)
@@ -5194,7 +5194,7 @@ process_control_chunks:
 					return (NULL);
 				}
 			}
-			/*
+			/*-
 			 * First are we accepting? We do this again here
 			 * since it is possible that a previous endpoint WAS
 			 * listening responded to a INIT-ACK and then

Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c	Fri Jun 23 06:25:39 2017	(r320259)
+++ head/sys/netinet/sctputil.c	Fri Jun 23 08:34:01 2017	(r320260)
@@ -7240,8 +7240,6 @@ sctp_over_udp_start(void)
 	return (0);
 }
 
-#if defined(INET6) || defined(INET)
-
 /*
  * sctp_min_mtu ()returns the minimum of all non-zero arguments.
  * If all arguments are zero, zero is returned.
@@ -7325,4 +7323,3 @@ sctp_hc_get_mtu(union sctp_sockstore *addr, uint16_t f
 	}
 	return ((uint32_t)tcp_hc_getmtu(&inc));
 }
-#endif

Modified: head/sys/netinet/sctputil.h
==============================================================================
--- head/sys/netinet/sctputil.h	Fri Jun 23 06:25:39 2017	(r320259)
+++ head/sys/netinet/sctputil.h	Fri Jun 23 08:34:01 2017	(r320260)
@@ -388,10 +388,8 @@ sctp_auditing(int, struct sctp_inpcb *, struct sctp_tc
 void sctp_audit_log(uint8_t, uint8_t);
 
 #endif
-#if defined(INET6) || defined(INET)
 uint32_t sctp_min_mtu(uint32_t, uint32_t, uint32_t);
 void sctp_hc_set_mtu(union sctp_sockstore *, uint16_t, uint32_t);
 uint32_t sctp_hc_get_mtu(union sctp_sockstore *, uint16_t);
-#endif
 #endif				/* _KERNEL */
 #endif



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