diff options
| author | Sridhar Samudrala <sri@us.ibm.com> | 2003-02-17 18:09:28 -0800 |
|---|---|---|
| committer | Sridhar Samudrala <sri@us.ibm.com> | 2003-02-17 18:09:28 -0800 |
| commit | 9967b51fc01aae6d822ad62ff031ff2d656d5b10 (patch) | |
| tree | e956f79d598e25a7a42faab23d0794ec992c20fa /net/sctp/endpointola.c | |
| parent | 611f4c044cbd8595d40d09a34981e57aa8aa5f30 (diff) | |
| parent | 13970d8e1ff3451967050309ce14ae2b6160bfd5 (diff) | |
Merge us.ibm.com:/home/sridhar/BK/linux-2.5.62
into us.ibm.com:/home/sridhar/BK/lksctp-2.5.62
Diffstat (limited to 'net/sctp/endpointola.c')
| -rw-r--r-- | net/sctp/endpointola.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index 4932831903aa..8efbd4af013e 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c @@ -92,7 +92,7 @@ fail: sctp_endpoint_t *sctp_endpoint_init(sctp_endpoint_t *ep, sctp_protocol_t *proto, struct sock *sk, int priority) { - sctp_opt_t *sp = sctp_sk(sk); + struct sctp_opt *sp = sctp_sk(sk); memset(ep, 0, sizeof(sctp_endpoint_t)); /* Initialize the base structure. */ @@ -105,10 +105,10 @@ sctp_endpoint_t *sctp_endpoint_init(sctp_endpoint_t *ep, sctp_protocol_t *proto, ep->base.malloced = 1; /* Create an input queue. */ - sctp_inqueue_init(&ep->base.inqueue); + sctp_inq_init(&ep->base.inqueue); /* Set its top-half handler */ - sctp_inqueue_set_th_handler(&ep->base.inqueue, + sctp_inq_set_th_handler(&ep->base.inqueue, (void (*)(void *))sctp_endpoint_bh_rcv, ep); @@ -198,7 +198,7 @@ void sctp_endpoint_destroy(sctp_endpoint_t *ep) sctp_unhash_endpoint(ep); /* Cleanup the inqueue. */ - sctp_inqueue_free(&ep->base.inqueue); + sctp_inq_free(&ep->base.inqueue); sctp_bind_addr_free(&ep->base.bind_addr); @@ -333,7 +333,7 @@ static void sctp_endpoint_bh_rcv(sctp_endpoint_t *ep) struct sock *sk; struct sctp_transport *transport; sctp_chunk_t *chunk; - sctp_inqueue_t *inqueue; + struct sctp_inq *inqueue; sctp_subtype_t subtype; sctp_state_t state; int error = 0; @@ -345,7 +345,7 @@ static void sctp_endpoint_bh_rcv(sctp_endpoint_t *ep) inqueue = &ep->base.inqueue; sk = ep->base.sk; - while (NULL != (chunk = sctp_pop_inqueue(inqueue))) { + while (NULL != (chunk = sctp_inq_pop(inqueue))) { subtype.chunk = chunk->chunk_hdr->type; /* We might have grown an association since last we @@ -369,6 +369,8 @@ static void sctp_endpoint_bh_rcv(sctp_endpoint_t *ep) */ if (asoc && sctp_chunk_is_data(chunk)) asoc->peer.last_data_from = chunk->transport; + else + SCTP_INC_STATS(SctpInCtrlChunks); if (chunk->transport) chunk->transport->last_time_heard = jiffies; |