---

yaml
---
r: 41809
b: refs/heads/master
c: 854d43a
h: refs/heads/master
i:
  41807: 4c8abe9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acd2bc96e19535fcd74c6eb94532c19c817857bd
+refs/heads/master: 854d43a465cc8ba8e501320b3bc27359d909da2f

trunk/include/net/sctp/structs.h

@@ -559,7 +559,7 @@ struct sctp_af {
 					  struct net_device *);
 	void		(*dst_saddr)	(union sctp_addr *saddr,
 					 struct dst_entry *dst,
-					 unsigned short port);
+					 __be16 port);
 	int		(*cmp_addr)	(const union sctp_addr *addr1,
 					 const union sctp_addr *addr2);
 	void		(*addr_copy)	(union sctp_addr *dst,

trunk/net/sctp/ipv6.c

@@ -434,7 +434,7 @@ static int sctp_v6_to_addr_param(const union sctp_addr *addr,
 
 /* Initialize a sctp_addr from a dst_entry. */
 static void sctp_v6_dst_saddr(union sctp_addr *addr, struct dst_entry *dst,
-			      unsigned short port)
+			      __be16 port)
 {
 	struct rt6_info *rt = (struct rt6_info *)dst;
 	addr->sa.sa_family = AF_INET6;

trunk/net/sctp/protocol.c

@@ -316,7 +316,7 @@ static int sctp_v4_to_addr_param(const union sctp_addr *addr,
 
 /* Initialize a sctp_addr from a dst_entry. */
 static void sctp_v4_dst_saddr(union sctp_addr *saddr, struct dst_entry *dst,
-			      unsigned short port)
+			      __be16 port)
 {
 	struct rtable *rt = (struct rtable *)dst;
 	saddr->v4.sin_family = AF_INET;
@@ -478,14 +478,12 @@ static struct dst_entry *sctp_v4_get_dst(struct sctp_association *asoc,
 		 */
 		sctp_read_lock(addr_lock);
 		list_for_each(pos, &bp->address_list) {
-			union sctp_addr tmp;
 			laddr = list_entry(pos, struct sctp_sockaddr_entry,
 					   list);
 			if (!laddr->use_as_src)
 				continue;
-			sctp_v4_dst_saddr(&dst_saddr, dst, bp->port);
-			flip_to_n(&tmp, &dst_saddr);
-			if (sctp_v4_cmp_addr(&tmp, &laddr->a))
+			sctp_v4_dst_saddr(&dst_saddr, dst, htons(bp->port));
+			if (sctp_v4_cmp_addr(&dst_saddr, &laddr->a))
 				goto out_unlock;
 		}
 		sctp_read_unlock(addr_lock);