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

Commit a9266268 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[SCTP]: Switch all remaining users of ->saddr_h to ->saddr. 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 16b0a030

include/net/sctp/structs.h

+0 −1
Original line number Diff line number Diff line
@@ -904,7 +904,6 @@ struct sctp_transport { 
	struct dst_entry *dst;

	/* Source address. */

	union sctp_addr saddr;

	union sctp_addr saddr_h;



	/* When was the last time(in jiffies) that a data packet was sent on

	 * this transport?  This is used to adjust the cwnd when the transport

net/sctp/ipv6.c

+2 −2
Original line number Diff line number Diff line
@@ -162,12 +162,12 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport, 
	 * and the source address from the transport.

	 */

	ipv6_addr_copy(&fl.fl6_dst, &transport->ipaddr_h.v6.sin6_addr);

	ipv6_addr_copy(&fl.fl6_src, &transport->saddr_h.v6.sin6_addr);

	ipv6_addr_copy(&fl.fl6_src, &transport->saddr.v6.sin6_addr);



	fl.fl6_flowlabel = np->flow_label;

	IP6_ECN_flow_xmit(sk, fl.fl6_flowlabel);

	if (ipv6_addr_type(&fl.fl6_src) & IPV6_ADDR_LINKLOCAL)

		fl.oif = transport->saddr_h.v6.sin6_scope_id;

		fl.oif = transport->saddr.v6.sin6_scope_id;

	else

		fl.oif = sk->sk_bound_dev_if;

	fl.fl_ip_sport = inet_sk(sk)->sport;

net/sctp/transport.c

+1 −3
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer, 


	peer->dst = NULL;

	memset(&peer->saddr, 0, sizeof(union sctp_addr));

	memset(&peer->saddr_h, 0, sizeof(union sctp_addr));



	/* From 6.3.1 RTO Calculation:

	 *
@@ -261,7 +260,6 @@ void sctp_transport_route(struct sctp_transport *transport, 
	else

		af->get_saddr(asoc, dst, daddr, &transport->saddr);



	flip_to_h(&transport->saddr_h, &transport->saddr);

	transport->dst = dst;

	if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) {

		return;
@@ -273,7 +271,7 @@ void sctp_transport_route(struct sctp_transport *transport, 
		 * association's active path for getsockname().

		 */ 

		if (asoc && (transport == asoc->peer.active_path))

			opt->pf->af->to_sk_saddr(&transport->saddr_h,

			opt->pf->af->to_sk_saddr(&transport->saddr,

						 asoc->base.sk);

	} else

		transport->pathmtu = SCTP_DEFAULT_MAXSEGMENT;