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

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

sctp: get sock from transport in sctp_transport_update_pmtu 



This patch is almost to revert commit 02f3d4ce ("sctp: Adjust PMTU
updates to accomodate route invalidation."). As t->asoc can't be NULL
in sctp_transport_update_pmtu, it could get sk from asoc, and no need
to pass sk into that function.

It is also to remove some duplicated codes from that function.

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

include/net/sctp/sctp.h

+2 −3
Original line number Diff line number Diff line
@@ -448,10 +448,9 @@ static inline int sctp_frag_point(const struct sctp_association *asoc, int pmtu) 
	return frag;

}



static inline void sctp_assoc_pending_pmtu(struct sock *sk, struct sctp_association *asoc)

static inline void sctp_assoc_pending_pmtu(struct sctp_association *asoc)

{



	sctp_assoc_sync_pmtu(sk, asoc);

	sctp_assoc_sync_pmtu(asoc);

	asoc->pmtu_pending = 0;

}

include/net/sctp/structs.h

+3 −3
Original line number Diff line number Diff line
@@ -952,8 +952,8 @@ void sctp_transport_lower_cwnd(struct sctp_transport *, sctp_lower_cwnd_t); 
void sctp_transport_burst_limited(struct sctp_transport *);

void sctp_transport_burst_reset(struct sctp_transport *);

unsigned long sctp_transport_timeout(struct sctp_transport *);

void sctp_transport_reset(struct sctp_transport *);

void sctp_transport_update_pmtu(struct sock *, struct sctp_transport *, u32);

void sctp_transport_reset(struct sctp_transport *t);

void sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu);

void sctp_transport_immediate_rtx(struct sctp_transport *);

void sctp_transport_dst_release(struct sctp_transport *t);

void sctp_transport_dst_confirm(struct sctp_transport *t);
@@ -1954,7 +1954,7 @@ void sctp_assoc_update(struct sctp_association *old, 


__u32 sctp_association_get_next_tsn(struct sctp_association *);



void sctp_assoc_sync_pmtu(struct sock *, struct sctp_association *);

void sctp_assoc_sync_pmtu(struct sctp_association *asoc);

void sctp_assoc_rwnd_increase(struct sctp_association *, unsigned int);

void sctp_assoc_rwnd_decrease(struct sctp_association *, unsigned int);

void sctp_assoc_set_primary(struct sctp_association *,

net/sctp/associola.c

+3 −3
Original line number Diff line number Diff line
@@ -1412,7 +1412,7 @@ sctp_assoc_choose_alter_transport(struct sctp_association *asoc, 
/* Update the association's pmtu and frag_point by going through all the

 * transports. This routine is called when a transport's PMTU has changed.

 */

void sctp_assoc_sync_pmtu(struct sock *sk, struct sctp_association *asoc)

void sctp_assoc_sync_pmtu(struct sctp_association *asoc)

{

	struct sctp_transport *t;

	__u32 pmtu = 0;
@@ -1424,8 +1424,8 @@ void sctp_assoc_sync_pmtu(struct sock *sk, struct sctp_association *asoc) 
	list_for_each_entry(t, &asoc->peer.transport_addr_list,

				transports) {

		if (t->pmtu_pending && t->dst) {

			sctp_transport_update_pmtu(sk, t,

						   SCTP_TRUNC4(dst_mtu(t->dst)));

			sctp_transport_update_pmtu(

					t, SCTP_TRUNC4(dst_mtu(t->dst)));

			t->pmtu_pending = 0;

		}

		if (!pmtu || (t->pathmtu < pmtu))

net/sctp/input.c

+2 −2
Original line number Diff line number Diff line
@@ -401,10 +401,10 @@ void sctp_icmp_frag_needed(struct sock *sk, struct sctp_association *asoc, 


	if (t->param_flags & SPP_PMTUD_ENABLE) {

		/* Update transports view of the MTU */

		sctp_transport_update_pmtu(sk, t, pmtu);

		sctp_transport_update_pmtu(t, pmtu);



		/* Update association pmtu. */

		sctp_assoc_sync_pmtu(sk, asoc);

		sctp_assoc_sync_pmtu(asoc);

	}



	/* Retransmit with the new pmtu setting.

net/sctp/output.c

+2 −2
Original line number Diff line number Diff line
@@ -105,10 +105,10 @@ void sctp_packet_config(struct sctp_packet *packet, __u32 vtag, 
	if (!sctp_transport_dst_check(tp)) {

		sctp_transport_route(tp, NULL, sctp_sk(sk));

		if (asoc->param_flags & SPP_PMTUD_ENABLE)

			sctp_assoc_sync_pmtu(sk, asoc);

			sctp_assoc_sync_pmtu(asoc);

	} else if (!sctp_transport_pmtu_check(tp)) {

		if (asoc->param_flags & SPP_PMTUD_ENABLE)

			sctp_assoc_sync_pmtu(sk, asoc);

			sctp_assoc_sync_pmtu(asoc);

	}



	/* If there a is a prepend chunk stick it on the list before