Code cleanup, no functional change.
MFC after: 1 week
This commit is contained in:
parent
ef0c8428f9
commit
cdd2d7d4a5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=323861
@ -969,9 +969,6 @@ __FBSDID("$FreeBSD$");
|
||||
#define SCTP_SO_NOT_LOCKED 0
|
||||
|
||||
|
||||
#define SCTP_HOLDS_LOCK 1
|
||||
#define SCTP_NOT_LOCKED 0
|
||||
|
||||
/*-
|
||||
* For address locks, do we hold the lock?
|
||||
*/
|
||||
|
@ -197,8 +197,7 @@ sctp_handle_init(struct mbuf *m, int iphlen, int offset,
|
||||
sctp_send_initiate_ack(inp, stcb, net, m, iphlen, offset,
|
||||
src, dst, sh, cp,
|
||||
mflowtype, mflowid,
|
||||
vrf_id, port,
|
||||
((stcb == NULL) ? SCTP_HOLDS_LOCK : SCTP_NOT_LOCKED));
|
||||
vrf_id, port);
|
||||
}
|
||||
outnow:
|
||||
if (stcb == NULL) {
|
||||
|
@ -5491,7 +5491,7 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
|
||||
struct sockaddr *src, struct sockaddr *dst,
|
||||
struct sctphdr *sh, struct sctp_init_chunk *init_chk,
|
||||
uint8_t mflowtype, uint32_t mflowid,
|
||||
uint32_t vrf_id, uint16_t port, int hold_inp_lock)
|
||||
uint32_t vrf_id, uint16_t port)
|
||||
{
|
||||
struct sctp_association *asoc;
|
||||
struct mbuf *m, *m_tmp, *m_last, *m_cookie, *op_err;
|
||||
@ -5839,10 +5839,6 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
|
||||
} else {
|
||||
uint32_t vtag, itsn;
|
||||
|
||||
if (hold_inp_lock) {
|
||||
SCTP_INP_INCR_REF(inp);
|
||||
SCTP_INP_RUNLOCK(inp);
|
||||
}
|
||||
if (asoc) {
|
||||
atomic_add_int(&asoc->refcnt, 1);
|
||||
SCTP_TCB_UNLOCK(stcb);
|
||||
@ -5862,12 +5858,12 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
|
||||
SCTP_TCB_LOCK(stcb);
|
||||
atomic_add_int(&asoc->refcnt, -1);
|
||||
} else {
|
||||
SCTP_INP_INCR_REF(inp);
|
||||
SCTP_INP_RUNLOCK(inp);
|
||||
vtag = sctp_select_a_tag(inp, inp->sctp_lport, sh->src_port, 1);
|
||||
initack->init.initiate_tag = htonl(vtag);
|
||||
/* get a TSN to use too */
|
||||
initack->init.initial_tsn = htonl(sctp_select_initial_TSN(&inp->sctp_ep));
|
||||
}
|
||||
if (hold_inp_lock) {
|
||||
SCTP_INP_RLOCK(inp);
|
||||
SCTP_INP_DECR_REF(inp);
|
||||
}
|
||||
|
@ -86,7 +86,7 @@ sctp_send_initiate_ack(struct sctp_inpcb *, struct sctp_tcb *,
|
||||
struct sockaddr *, struct sockaddr *,
|
||||
struct sctphdr *, struct sctp_init_chunk *,
|
||||
uint8_t, uint32_t,
|
||||
uint32_t, uint16_t, int);
|
||||
uint32_t, uint16_t);
|
||||
|
||||
struct mbuf *
|
||||
sctp_arethere_unrecognized_parameters(struct mbuf *, int, int *,
|
||||
|
Loading…
Reference in New Issue
Block a user