Commit 28e72b26 authored by Vito Caputo's avatar Vito Caputo Committed by David S. Miller
Browse files

sock_get_timeout: drop unnecessary return variable 



Remove pointless use of size return variable by directly returning
sizes.

Signed-off-by: default avatarVito Caputo <vcaputo@pengaru.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 262ce0af

net/core/sock.c

+3 −6
Original line number Diff line number Diff line
@@ -333,7 +333,6 @@ EXPORT_SYMBOL(__sk_backlog_rcv); 
static int sock_get_timeout(long timeo, void *optval, bool old_timeval)

{

	struct __kernel_sock_timeval tv;

	int size;



	if (timeo == MAX_SCHEDULE_TIMEOUT) {

		tv.tv_sec = 0;
@@ -354,13 +353,11 @@ static int sock_get_timeout(long timeo, void *optval, bool old_timeval) 
		old_tv.tv_sec = tv.tv_sec;

		old_tv.tv_usec = tv.tv_usec;

		*(struct __kernel_old_timeval *)optval = old_tv;

		size = sizeof(old_tv);

	} else {

		*(struct __kernel_sock_timeval *)optval = tv;

		size = sizeof(tv);

		return sizeof(old_tv);

	}



	return size;

	*(struct __kernel_sock_timeval *)optval = tv;

	return sizeof(tv);

}



static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen, bool old_timeval)