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

Commit 9162e0ed authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: implement enqueue_event for sctp_stream_interleave 



enqueue_event is added as a member of sctp_stream_interleave, used to
enqueue either data, idata or notification events into user socket rx
queue.

It replaces sctp_ulpq_tail_event used in the other places with
enqueue_event.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Acked-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd4d627d

include/net/sctp/stream_interleave.h

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ struct sctp_stream_interleave { 
	bool	(*validate_data)(struct sctp_chunk *chunk);

	int	(*ulpevent_data)(struct sctp_ulpq *ulpq,

				 struct sctp_chunk *chunk, gfp_t gfp);

	int	(*enqueue_event)(struct sctp_ulpq *ulpq,

				 struct sctp_ulpevent *event);

};



void sctp_stream_interleave_init(struct sctp_stream *stream);

net/sctp/associola.c

+1 −1
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ void sctp_assoc_control_transport(struct sctp_association *asoc, 
		event = sctp_ulpevent_make_peer_addr_change(asoc, &addr,

					0, spc_state, error, GFP_ATOMIC);

		if (event)

			sctp_ulpq_tail_event(&asoc->ulpq, event);

			asoc->stream.si->enqueue_event(&asoc->ulpq, event);

	}



	/* Select new active and retran paths. */

net/sctp/chunk.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void sctp_datamsg_destroy(struct sctp_datamsg *msg) 
			ev = sctp_ulpevent_make_send_failed(asoc, chunk, sent,

							    error, GFP_ATOMIC);

			if (ev)

				sctp_ulpq_tail_event(&asoc->ulpq, ev);

				asoc->stream.si->enqueue_event(&asoc->ulpq, ev);

		}



		sctp_chunk_put(chunk);

net/sctp/sm_sideeffect.c

+5 −4
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ static void sctp_cmd_process_operr(struct sctp_cmd_seq *cmds, 
		if (!ev)

			return;



		sctp_ulpq_tail_event(&asoc->ulpq, ev);

		asoc->stream.si->enqueue_event(&asoc->ulpq, ev);



		switch (err_hdr->cause) {

		case SCTP_ERROR_UNKNOWN_CHUNK:
@@ -1058,7 +1058,7 @@ static void sctp_cmd_assoc_change(struct sctp_cmd_seq *commands, 
					    asoc->c.sinit_max_instreams,

					    NULL, GFP_ATOMIC);

	if (ev)

		sctp_ulpq_tail_event(&asoc->ulpq, ev);

		asoc->stream.si->enqueue_event(&asoc->ulpq, ev);

}



/* Helper function to generate an adaptation indication event */
@@ -1070,7 +1070,7 @@ static void sctp_cmd_adaptation_ind(struct sctp_cmd_seq *commands, 
	ev = sctp_ulpevent_make_adaptation_indication(asoc, GFP_ATOMIC);



	if (ev)

		sctp_ulpq_tail_event(&asoc->ulpq, ev);

		asoc->stream.si->enqueue_event(&asoc->ulpq, ev);

}
@@ -1493,7 +1493,8 @@ static int sctp_cmd_interpreter(enum sctp_event event_type, 
			pr_debug("%s: sm_sideff: event_up:%p, ulpq:%p\n",

				 __func__, cmd->obj.ulpevent, &asoc->ulpq);



			sctp_ulpq_tail_event(&asoc->ulpq, cmd->obj.ulpevent);

			asoc->stream.si->enqueue_event(&asoc->ulpq,

						       cmd->obj.ulpevent);

			break;



		case SCTP_CMD_REPLY:

net/sctp/socket.c

+1 −1
Original line number Diff line number Diff line
@@ -2294,7 +2294,7 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval, 
			if (!event)

				return -ENOMEM;



			sctp_ulpq_tail_event(&asoc->ulpq, event);

			asoc->stream.si->enqueue_event(&asoc->ulpq, event);

		}

	}