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

Commit 24cb81a6 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

sctp: Push struct net down into all of the state machine functions 



There are a handle of state machine functions primarily those dealing
with processing INIT packets where there is neither a valid endpoint nor
a valid assoication from which to derive a struct net.  Therefore add
struct net * to the parameter list of sctp_state_fn_t and update all of
the state machine functions.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7ff4a70

include/net/sctp/sm.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,8 @@ typedef struct { 
	int action;

	int action;

} sctp_sm_command_t;

} sctp_sm_command_t;





typedef sctp_disposition_t (sctp_state_fn_t) (const struct sctp_endpoint *,

typedef sctp_disposition_t (sctp_state_fn_t) (struct net *,

					      const struct sctp_endpoint *,

					      const struct sctp_association *,

					      const struct sctp_association *,

					      const sctp_subtype_t type,

					      const sctp_subtype_t type,

					      void *arg,

					      void *arg,

net/sctp/sm_sideeffect.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1123,7 +1123,7 @@ int sctp_do_sm(struct net *net, sctp_event_t event_type, sctp_subtype_t subtype, 
	sctp_init_cmd_seq(&commands);

	sctp_init_cmd_seq(&commands);





	DEBUG_PRE;

	DEBUG_PRE;

	status = (*state_fn->fn)(ep, asoc, subtype, event_arg, &commands);

	status = (*state_fn->fn)(net, ep, asoc, subtype, event_arg, &commands);

	DEBUG_POST;

	DEBUG_POST;





	error = sctp_side_effects(event_type, subtype, state,

	error = sctp_side_effects(event_type, subtype, state,

net/sctp/sm_statefuns.c

+338 −281

File changed.

Preview size limit exceeded, changes collapsed.