Cleanups, no functional change.
MFC after: 1 week
This commit is contained in:
parent
e7fd9688ea
commit
4471043177
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=362173
@ -66,7 +66,7 @@ sctp_add_chk_to_control(struct sctp_queued_to_read *control,
|
|||||||
struct sctp_stream_in *strm,
|
struct sctp_stream_in *strm,
|
||||||
struct sctp_tcb *stcb,
|
struct sctp_tcb *stcb,
|
||||||
struct sctp_association *asoc,
|
struct sctp_association *asoc,
|
||||||
struct sctp_tmit_chunk *chk, int lock_held);
|
struct sctp_tmit_chunk *chk, int hold_rlock);
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -5118,7 +5118,6 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return (op_err);
|
return (op_err);
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
/*
|
/*
|
||||||
|
@ -767,8 +767,8 @@ sctp_ss_fb_scheduled(struct sctp_tcb *stcb, struct sctp_nets *net SCTP_UNUSED,
|
|||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
sctp_ss_fcfs_add(struct sctp_tcb *stcb, struct sctp_association *asoc,
|
sctp_ss_fcfs_add(struct sctp_tcb *stcb, struct sctp_association *asoc,
|
||||||
struct sctp_stream_out *strq, struct sctp_stream_queue_pending *sp,
|
struct sctp_stream_out *strq SCTP_UNUSED,
|
||||||
int holds_lock);
|
struct sctp_stream_queue_pending *sp, int holds_lock);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
sctp_ss_fcfs_init(struct sctp_tcb *stcb, struct sctp_association *asoc,
|
sctp_ss_fcfs_init(struct sctp_tcb *stcb, struct sctp_association *asoc,
|
||||||
|
@ -5230,10 +5230,6 @@ sctp_find_ifa_in_ep(struct sctp_inpcb *inp, struct sockaddr *addr,
|
|||||||
if (((struct sockaddr_in *)addr)->sin_addr.s_addr ==
|
if (((struct sockaddr_in *)addr)->sin_addr.s_addr ==
|
||||||
laddr->ifa->address.sin.sin_addr.s_addr) {
|
laddr->ifa->address.sin.sin_addr.s_addr) {
|
||||||
/* found him. */
|
/* found him. */
|
||||||
if (holds_lock == 0) {
|
|
||||||
SCTP_INP_RUNLOCK(inp);
|
|
||||||
}
|
|
||||||
return (laddr->ifa);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -5243,10 +5239,6 @@ sctp_find_ifa_in_ep(struct sctp_inpcb *inp, struct sockaddr *addr,
|
|||||||
if (SCTP6_ARE_ADDR_EQUAL((struct sockaddr_in6 *)addr,
|
if (SCTP6_ARE_ADDR_EQUAL((struct sockaddr_in6 *)addr,
|
||||||
&laddr->ifa->address.sin6)) {
|
&laddr->ifa->address.sin6)) {
|
||||||
/* found him. */
|
/* found him. */
|
||||||
if (holds_lock == 0) {
|
|
||||||
SCTP_INP_RUNLOCK(inp);
|
|
||||||
}
|
|
||||||
return (laddr->ifa);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -5255,7 +5247,7 @@ sctp_find_ifa_in_ep(struct sctp_inpcb *inp, struct sockaddr *addr,
|
|||||||
if (holds_lock == 0) {
|
if (holds_lock == 0) {
|
||||||
SCTP_INP_RUNLOCK(inp);
|
SCTP_INP_RUNLOCK(inp);
|
||||||
}
|
}
|
||||||
return (NULL);
|
return (laddr->ifa);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t
|
uint32_t
|
||||||
@ -5332,9 +5324,6 @@ sctp_find_ifa_by_addr(struct sockaddr *addr, uint32_t vrf_id, int holds_lock)
|
|||||||
if (((struct sockaddr_in *)addr)->sin_addr.s_addr ==
|
if (((struct sockaddr_in *)addr)->sin_addr.s_addr ==
|
||||||
sctp_ifap->address.sin.sin_addr.s_addr) {
|
sctp_ifap->address.sin.sin_addr.s_addr) {
|
||||||
/* found him. */
|
/* found him. */
|
||||||
if (holds_lock == 0)
|
|
||||||
SCTP_IPI_ADDR_RUNLOCK();
|
|
||||||
return (sctp_ifap);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -5344,9 +5333,6 @@ sctp_find_ifa_by_addr(struct sockaddr *addr, uint32_t vrf_id, int holds_lock)
|
|||||||
if (SCTP6_ARE_ADDR_EQUAL((struct sockaddr_in6 *)addr,
|
if (SCTP6_ARE_ADDR_EQUAL((struct sockaddr_in6 *)addr,
|
||||||
&sctp_ifap->address.sin6)) {
|
&sctp_ifap->address.sin6)) {
|
||||||
/* found him. */
|
/* found him. */
|
||||||
if (holds_lock == 0)
|
|
||||||
SCTP_IPI_ADDR_RUNLOCK();
|
|
||||||
return (sctp_ifap);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -5354,7 +5340,7 @@ sctp_find_ifa_by_addr(struct sockaddr *addr, uint32_t vrf_id, int holds_lock)
|
|||||||
}
|
}
|
||||||
if (holds_lock == 0)
|
if (holds_lock == 0)
|
||||||
SCTP_IPI_ADDR_RUNLOCK();
|
SCTP_IPI_ADDR_RUNLOCK();
|
||||||
return (NULL);
|
return (sctp_ifap);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -6930,7 +6916,7 @@ sctp_local_addr_count(struct sctp_tcb *stcb)
|
|||||||
#if defined(INET)
|
#if defined(INET)
|
||||||
int ipv4_local_scope, ipv4_addr_legal;
|
int ipv4_local_scope, ipv4_addr_legal;
|
||||||
#endif
|
#endif
|
||||||
#if defined (INET6)
|
#if defined(INET6)
|
||||||
int local_scope, site_scope, ipv6_addr_legal;
|
int local_scope, site_scope, ipv6_addr_legal;
|
||||||
#endif
|
#endif
|
||||||
struct sctp_vrf *vrf;
|
struct sctp_vrf *vrf;
|
||||||
|
Loading…
Reference in New Issue
Block a user