Merge tag 'arc-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[platform/kernel/linux-starfive.git] / net / ipv4 / af_inet.c

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 72fde28..93da9f7 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -836,7 +836,7 @@ ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset,
 EXPORT_SYMBOL(inet_sendpage);
 
 INDIRECT_CALLABLE_DECLARE(int udp_recvmsg(struct sock *, struct msghdr *,
-                                         size_t, int, int, int *));
+                                         size_t, int, int *));
 int inet_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
                 int flags)
 {
@@ -848,8 +848,7 @@ int inet_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
                sock_rps_record_flow(sk);
 
        err = INDIRECT_CALL_2(sk->sk_prot->recvmsg, tcp_recvmsg, udp_recvmsg,
-                             sk, msg, size, flags & MSG_DONTWAIT,
-                             flags & ~MSG_DONTWAIT, &addr_len);
+                             sk, msg, size, flags, &addr_len);
        if (err >= 0)
                msg->msg_namelen = addr_len;
        return err;
@@ -1234,9 +1233,9 @@ static int inet_sk_reselect_saddr(struct sock *sk)
 
        /* Query new route. */
        fl4 = &inet->cork.fl.u.ip4;
-       rt = ip_route_connect(fl4, daddr, 0, RT_CONN_FLAGS(sk),
-                             sk->sk_bound_dev_if, sk->sk_protocol,
-                             inet->inet_sport, inet->inet_dport, sk);
+       rt = ip_route_connect(fl4, daddr, 0, sk->sk_bound_dev_if,
+                             sk->sk_protocol, inet->inet_sport,
+                             inet->inet_dport, sk);
        if (IS_ERR(rt))
                return PTR_ERR(rt);