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

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

sctp: Adjust PMTU updates to accomodate route invalidation. 



This adjusts the call to dst_ops->update_pmtu() so that we can
transparently handle the fact that, in the future, the dst itself can
be invalidated by the PMTU update (when we have non-host routes cached
in sockets).

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 35ad9b9c

include/net/sctp/sctp.h

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

}



static inline void sctp_assoc_pending_pmtu(struct sctp_association *asoc)

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

{



	sctp_assoc_sync_pmtu(asoc);

	sctp_assoc_sync_pmtu(sk, asoc);

	asoc->pmtu_pending = 0;

}

include/net/sctp/structs.h

+2 −2
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ 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 sctp_transport *, u32);

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

void sctp_transport_immediate_rtx(struct sctp_transport *);
@@ -2003,7 +2003,7 @@ void sctp_assoc_update(struct sctp_association *old, 


__u32 sctp_association_get_next_tsn(struct sctp_association *);



void sctp_assoc_sync_pmtu(struct sctp_association *);

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

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

+2 −2
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ struct sctp_transport *sctp_assoc_choose_alter_transport( 
/* 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 sctp_association *asoc)

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

{

	struct sctp_transport *t;

	__u32 pmtu = 0;
@@ -1372,7 +1372,7 @@ void sctp_assoc_sync_pmtu(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(t, dst_mtu(t->dst));

			sctp_transport_update_pmtu(sk, t, 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
@@ -408,10 +408,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(t, pmtu);

		sctp_transport_update_pmtu(sk, t, pmtu);



		/* Update association pmtu. */

		sctp_assoc_sync_pmtu(asoc);

		sctp_assoc_sync_pmtu(sk, asoc);

	}



	/* Retransmit with the new pmtu setting.

net/sctp/output.c

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ int sctp_packet_transmit(struct sctp_packet *packet) 
	if (!sctp_transport_dst_check(tp)) {

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

		if (asoc && (asoc->param_flags & SPP_PMTUD_ENABLE)) {

			sctp_assoc_sync_pmtu(asoc);

			sctp_assoc_sync_pmtu(sk, asoc);

		}

	}

	dst = dst_clone(tp->dst);