Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / ipv4 / datagram.c

diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c
index 174be6c..85bd24c 100644 (file)
--- a/net/ipv4/datagram.c
+++ b/net/ipv4/datagram.c
@@ -46,11 +46,12 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
                if (!saddr)
                        saddr = inet->mc_addr;
        }
-       err = ip_route_connect(&rt, usin->sin_addr.s_addr, saddr,
-                              RT_CONN_FLAGS(sk), oif,
-                              sk->sk_protocol,
-                              inet->inet_sport, usin->sin_port, sk, 1);
-       if (err) {
+       rt = ip_route_connect(usin->sin_addr.s_addr, saddr,
+                             RT_CONN_FLAGS(sk), oif,
+                             sk->sk_protocol,
+                             inet->inet_sport, usin->sin_port, sk, true);
+       if (IS_ERR(rt)) {
+               err = PTR_ERR(rt);
                if (err == -ENETUNREACH)
                        IP_INC_STATS_BH(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
                return err;