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

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

sctp: remove reconf_enable from asoc 



asoc's reconf support is actually decided by the 4-shakehand negotiation,
not something that users can set by sockopt. asoc->peer.reconf_capable is
working for this. So remove it from asoc.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ccf355e5

include/net/sctp/structs.h

+1 −2
Original line number Diff line number Diff line
@@ -2051,8 +2051,7 @@ struct sctp_association { 
	     temp:1,		/* Is it a temporary association? */

	     force_delay:1,

	     intl_enable:1,

	     prsctp_enable:1,

	     reconf_enable:1;

	     prsctp_enable:1;



	__u8 strreset_enable;

	__u8 strreset_outstanding; /* request param count on the fly */

net/sctp/associola.c

+0 −1
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ static struct sctp_association *sctp_association_init( 


	asoc->active_key_id = ep->active_key_id;

	asoc->prsctp_enable = ep->prsctp_enable;

	asoc->reconf_enable = ep->reconf_enable;

	asoc->strreset_enable = ep->strreset_enable;



	/* Save the hmacs and chunks list into this association */

net/sctp/sm_make_chunk.c

+2 −3
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc, 
		num_ext += 2;

	}



	if (asoc->reconf_enable) {

	if (asoc->ep->reconf_enable) {

		extensions[num_ext] = SCTP_CID_RECONF;

		num_ext += 1;

	}
@@ -2007,8 +2007,7 @@ static void sctp_process_ext_param(struct sctp_association *asoc, 
	for (i = 0; i < num_ext; i++) {

		switch (param.ext->chunks[i]) {

		case SCTP_CID_RECONF:

			if (asoc->reconf_enable &&

			    !asoc->peer.reconf_capable)

			if (asoc->ep->reconf_enable)

				asoc->peer.reconf_capable = 1;

			break;

		case SCTP_CID_FWD_TSN:

net/sctp/socket.c

+2 −5
Original line number Diff line number Diff line
@@ -4226,9 +4226,6 @@ static int sctp_setsockopt_reconfig_supported(struct sock *sk, 
	    sctp_style(sk, UDP))

		goto out;



	if (asoc)

		asoc->reconf_enable = !!params.assoc_value;

	else

	sctp_sk(sk)->ep->reconf_enable = !!params.assoc_value;



	retval = 0;
@@ -7536,7 +7533,7 @@ static int sctp_getsockopt_reconfig_supported(struct sock *sk, int len, 
		goto out;

	}



	params.assoc_value = asoc ? asoc->reconf_enable

	params.assoc_value = asoc ? asoc->peer.reconf_capable

				  : sctp_sk(sk)->ep->reconf_enable;



	if (put_user(len, optlen))