d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove last argument of sctp_addr_mgmt_ep_sa(), since it is not used.

Browse Source 
MFC after:		1 week
This commit is contained in:
Michael Tuexen 2020-06-19 12:35:29 +00:00
parent cdd02f43b9
commit 7a9dbc33f9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=362377
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/netinet/sctp_asconf.c
View File

@ -3165,7 +3165,7 @@ sctp_check_address_list(struct sctp_tcb *stcb, struct mbuf *m, int offset,
*/
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;
@ -3174,9 +3174,7 @@ sctp_addr_mgmt_ep_sa(struct sctp_inpcb *inp, struct sockaddr *sa,
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) {

4
sys/netinet/sctp_asconf.h
View File

@ -56,8 +56,8 @@ sctp_handle_asconf_ack(struct mbuf *, int, struct sctp_asconf_ack_chunk *,
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

6
sys/netinet/sctputil.c
View File

@ -6804,8 +6804,7 @@ sctp_bindx_add_address(struct socket *so, struct sctp_inpcb *inp,
} 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;
}
@ -6896,8 +6895,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