From: Stefano Brivio <sbrivio@redhat.com>
Date: Mon, 19 Mar 2018 10:24:58 +0000 (+0100)
Subject: ipv6: old_dport should be a __be16 in __ip6_datagram_connect()
X-Git-Tag: v4.16-rc7~23^2~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5f2fb802eee1df0810b47ea251942fe3fd36589a;p=linux.git

ipv6: old_dport should be a __be16 in __ip6_datagram_connect()

Fixes: 2f987a76a977 ("net: ipv6: keep sk status consistent after datagram connect failure")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Acked-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 8a9ac2d0f5d3..a9f7eca0b6a3 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -149,7 +149,7 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr,
 	struct in6_addr		*daddr, old_daddr;
 	__be32			fl6_flowlabel = 0;
 	__be32			old_fl6_flowlabel;
-	__be32			old_dport;
+	__be16			old_dport;
 	int			addr_type;
 	int			err;