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

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

[SCTP]: Switch ->from_addr_param() to net-endian. 



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

include/net/sctp/structs.h

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ struct sctp_af { 
					 struct sock *sk);

	void		(*from_addr_param) (union sctp_addr *,

					    union sctp_addr_param *,

					    __u16 port, int iif);	

					    __be16 port, int iif);

	int		(*to_addr_param) (const union sctp_addr *,

					  union sctp_addr_param *); 

	int		(*addr_valid)	(union sctp_addr *,

net/sctp/bind_addr.c

+2 −4
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list, 
	int retval = 0;

	int len;

	struct sctp_af *af;

	union sctp_addr tmp;



	/* Convert the raw address to standard address format */

	while (addrs_len) {
@@ -278,9 +277,8 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list, 
			break;

		}



		af->from_addr_param(&addr, rawaddr, port, 0);

		flip_to_n(&tmp, &addr);

		retval = sctp_add_bind_addr(bp, &tmp, 1, gfp);

		af->from_addr_param(&addr, rawaddr, htons(port), 0);

		retval = sctp_add_bind_addr(bp, &addr, 1, gfp);

		if (retval) {

			/* Can't finish building the list, clean up. */

			sctp_bind_addr_clean(bp);

net/sctp/input.c

+2 −4
Original line number Diff line number Diff line
@@ -914,7 +914,6 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct sk_buff *skb, 
	sctp_init_chunk_t *init;

	struct sctp_transport *transport;

	struct sctp_af *af;

	union sctp_addr tmp2;



	ch = (sctp_chunkhdr_t *) skb->data;
@@ -961,10 +960,9 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct sk_buff *skb, 
		if (!af)

			continue;



		af->from_addr_param(paddr, params.addr, ntohs(sh->source), 0);

		flip_to_n(&tmp2, paddr);

		af->from_addr_param(paddr, params.addr, sh->source, 0);



		asoc = __sctp_lookup_association(laddr, &tmp2, &transport);

		asoc = __sctp_lookup_association(laddr, paddr, &transport);

		if (asoc)

			return asoc;

	}

net/sctp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static void sctp_v6_to_sk_daddr(union sctp_addr *addr, struct sock *sk) 
/* Initialize a sctp_addr from an address parameter. */

static void sctp_v6_from_addr_param(union sctp_addr *addr,

				    union sctp_addr_param *param,

				    __u16 port, int iif)

				    __be16 port, int iif)

{

	addr->v6.sin6_family = AF_INET6;

	addr->v6.sin6_port = port;

net/sctp/protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static void sctp_v4_to_sk_daddr(union sctp_addr *addr, struct sock *sk) 
/* Initialize a sctp_addr from an address parameter. */

static void sctp_v4_from_addr_param(union sctp_addr *addr,

				    union sctp_addr_param *param,

				    __u16 port, int iif)

				    __be16 port, int iif)

{

	addr->v4.sin_family = AF_INET;

	addr->v4.sin_port = port;