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

Commit d5716472 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: ipc_router: Update the receive operation to be blocking by default"

parents 9a125395 3b7149ac

net/ipc_router/ipc_router_private.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#define IPC_ROUTER_DEFAULT_RX_QUOTA	5



#define IPC_ROUTER_INFINITY -1

#define DEFAULT_RCV_TIMEO 0

#define DEFAULT_RCV_TIMEO IPC_ROUTER_INFINITY



#define ALIGN_SIZE(x) ((4 - ((x) & 3)) & 3)

net/ipc_router/ipc_router_socket.c

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static int msm_ipc_router_recvmsg(struct kiocb *iocb, struct socket *sock, 
		return -EINVAL;



	lock_sock(sk);

	timeout = sk->sk_rcvtimeo;

	timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);



	ret = msm_ipc_router_rx_data_wait(port_ptr, timeout);

	if (ret) {