Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b91ddd84 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev

parents 05bb1fad cb243a1a

include/net/sctp/sm.h

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ struct sctp_chunk *sctp_make_shutdown_ack(const struct sctp_association *asoc, 
					  const struct sctp_chunk *);

struct sctp_chunk *sctp_make_shutdown_complete(const struct sctp_association *,

					  const struct sctp_chunk *);

void sctp_init_cause(struct sctp_chunk *, __be16 cause, const void *, size_t);

void sctp_init_cause(struct sctp_chunk *, __be16 cause, size_t);

struct sctp_chunk *sctp_make_abort(const struct sctp_association *,

			      const struct sctp_chunk *,

			      const size_t hint);

include/net/sctp/structs.h

+1 −0
Original line number Diff line number Diff line
@@ -726,6 +726,7 @@ int sctp_user_addto_chunk(struct sctp_chunk *chunk, int off, int len, 
			  struct iovec *data);

void sctp_chunk_free(struct sctp_chunk *);

void  *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data);

void  *sctp_addto_param(struct sctp_chunk *, int len, const void *data);

struct sctp_chunk *sctp_chunkify(struct sk_buff *,

				 const struct sctp_association *,

				 struct sock *);

include/net/sctp/ulpqueue.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ int sctp_clear_pd(struct sock *sk, struct sctp_association *asoc); 
/* Skip over an SSN. */

void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn);



void sctp_ulpq_reasm_flushtsn(struct sctp_ulpq *, __u32);

#endif /* __sctp_ulpqueue_h__ */

net/sctp/associola.c

+6 −1
Original line number Diff line number Diff line
@@ -727,7 +727,12 @@ void sctp_assoc_control_transport(struct sctp_association *asoc, 
		break;



	case SCTP_TRANSPORT_DOWN:

		/* if the transort was never confirmed, do not transition it

		 * to inactive state.

		 */

		if (transport->state != SCTP_UNCONFIRMED)

			transport->state = SCTP_INACTIVE;



		spc_state = SCTP_ADDR_UNREACHABLE;

		break;

net/sctp/outqueue.c

+7 −0
Original line number Diff line number Diff line
@@ -421,6 +421,13 @@ void sctp_retransmit_mark(struct sctp_outq *q, 
		 */

		if ((fast_retransmit && (chunk->fast_retransmit > 0)) ||

		   (!fast_retransmit && !chunk->tsn_gap_acked)) {

			/* If this chunk was sent less then 1 rto ago, do not

			 * retransmit this chunk, but give the peer time

			 * to acknowlege it.

			 */

			if ((jiffies - chunk->sent_at) < transport->rto)

				continue;



			/* RFC 2960 6.2.1 Processing a Received SACK

			 *

			 * C) Any time a DATA chunk is marked for