Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 24 Aug 2020 08:14:41 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r364615 - stable/12/sys/netinet
Message-ID:  <202008240814.07O8EfT7064614@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: tuexen
Date: Mon Aug 24 08:14:41 2020
New Revision: 364615
URL: https://svnweb.freebsd.org/changeset/base/364615

Log:
  MFC r362377:
  Remove last argument of sctp_addr_mgmt_ep_sa(), since it is not used.

Modified:
  stable/12/sys/netinet/sctp_asconf.c
  stable/12/sys/netinet/sctp_asconf.h
  stable/12/sys/netinet/sctputil.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet/sctp_asconf.c
==============================================================================
--- stable/12/sys/netinet/sctp_asconf.c	Mon Aug 24 08:13:06 2020	(r364614)
+++ stable/12/sys/netinet/sctp_asconf.c	Mon Aug 24 08:14:41 2020	(r364615)
@@ -3178,7 +3178,7 @@ sctp_check_address_list(struct sctp_tcb *stcb, struct 
  */
 uint32_t
 sctp_addr_mgmt_ep_sa(struct sctp_inpcb *inp, struct sockaddr *sa,
-    uint32_t type, uint32_t vrf_id, struct sctp_ifa *sctp_ifap)
+    uint32_t type, uint32_t vrf_id)
 {
 	struct sctp_ifa *ifa;
 	struct sctp_laddr *laddr, *nladdr;
@@ -3187,9 +3187,7 @@ sctp_addr_mgmt_ep_sa(struct sctp_inpcb *inp, struct so
 		SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_ASCONF, EINVAL);
 		return (EINVAL);
 	}
-	if (sctp_ifap) {
-		ifa = sctp_ifap;
-	} else if (type == SCTP_ADD_IP_ADDRESS) {
+	if (type == SCTP_ADD_IP_ADDRESS) {
 		/* For an add the address MUST be on the system */
 		ifa = sctp_find_ifa_by_addr(sa, vrf_id, SCTP_ADDR_NOT_LOCKED);
 	} else if (type == SCTP_DEL_IP_ADDRESS) {

Modified: stable/12/sys/netinet/sctp_asconf.h
==============================================================================
--- stable/12/sys/netinet/sctp_asconf.h	Mon Aug 24 08:13:06 2020	(r364614)
+++ stable/12/sys/netinet/sctp_asconf.h	Mon Aug 24 08:14:41 2020	(r364615)
@@ -56,8 +56,8 @@ sctp_handle_asconf_ack(struct mbuf *, int, struct sctp
     struct sctp_tcb *, struct sctp_nets *, int *);
 
 extern uint32_t
-sctp_addr_mgmt_ep_sa(struct sctp_inpcb *, struct sockaddr *,
-    uint32_t, uint32_t, struct sctp_ifa *);
+sctp_addr_mgmt_ep_sa(struct sctp_inpcb *, struct sockaddr *, uint32_t,
+    uint32_t);
 
 
 extern int

Modified: stable/12/sys/netinet/sctputil.c
==============================================================================
--- stable/12/sys/netinet/sctputil.c	Mon Aug 24 08:13:06 2020	(r364614)
+++ stable/12/sys/netinet/sctputil.c	Mon Aug 24 08:14:41 2020	(r364615)
@@ -6792,8 +6792,7 @@ sctp_bindx_add_address(struct socket *so, struct sctp_
 		} else if (lep == NULL) {
 			((struct sockaddr_in *)addr_touse)->sin_port = 0;
 			*error = sctp_addr_mgmt_ep_sa(inp, addr_touse,
-			    SCTP_ADD_IP_ADDRESS,
-			    vrf_id, NULL);
+			    SCTP_ADD_IP_ADDRESS, vrf_id);
 		} else {
 			*error = EADDRINUSE;
 		}
@@ -6884,8 +6883,7 @@ sctp_bindx_delete_address(struct sctp_inpcb *inp,
 	if (assoc_id == 0) {
 		/* delete the address */
 		*error = sctp_addr_mgmt_ep_sa(inp, addr_touse,
-		    SCTP_DEL_IP_ADDRESS,
-		    vrf_id, NULL);
+		    SCTP_DEL_IP_ADDRESS, vrf_id);
 	} else {
 		/*
 		 * FIX: decide whether we allow assoc based bindx

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