svn commit: r347090 - stable/12/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sat May  4 10:04:00 2019
New Revision: 347090
URL: https://svnweb.freebsd.org/changeset/base/347090

Log:
  MFC r340179:
  Don't use a function when neither INET nor INET6 are defined.
  This is a valid case for the userland stack, where this fixes
  two set-but-not-used warnings in this case.
  
  Thanks to Christian Wright for reporting the issue.

Modified:
  stable/12/sys/netinet/sctp_output.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet/sctp_output.c
==============================================================================
--- stable/12/sys/netinet/sctp_output.c	Sat May  4 09:47:01 2019	(r347089)
+++ stable/12/sys/netinet/sctp_output.c	Sat May  4 10:04:00 2019	(r347090)
@@ -3733,6 +3733,7 @@ sctp_process_cmsgs_for_init(struct sctp_tcb *stcb, str
 	return (0);
 }
 
+#if defined(INET) || defined(INET6)
 static struct sctp_tcb *
 sctp_findassociation_cmsgs(struct sctp_inpcb **inp_p,
     uint16_t port,
@@ -3822,6 +3823,7 @@ sctp_findassociation_cmsgs(struct sctp_inpcb **inp_p,
 	}
 	return (NULL);
 }
+#endif
 
 static struct mbuf *
 sctp_add_cookie(struct mbuf *init, int init_offset,
@@ -12703,9 +12705,11 @@ sctp_lower_sosend(struct socket *so,
 		SCTP_INP_WUNLOCK(inp);
 		/* With the lock applied look again */
 		stcb = sctp_findassociation_ep_addr(&t_inp, addr, &net, NULL, NULL);
+#if defined(INET) || defined(INET6)
 		if ((stcb == NULL) && (control != NULL) && (port > 0)) {
 			stcb = sctp_findassociation_cmsgs(&t_inp, port, control, &net, &error);
 		}
+#endif
 		if (stcb == NULL) {
 			SCTP_INP_WLOCK(inp);
 			SCTP_INP_DECR_REF(inp);