hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sock_get_timeout: drop unnecessary return variable 

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

Signed-off-by: Vito Caputo <vcaputo@pengaru.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vito Caputo 2019-10-09 21:08:24 -07:00 committed by David S. Miller
parent 262ce0af81
commit 28e72b26dd
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/core/sock.c
View File

@ -333,7 +333,6 @@ EXPORT_SYMBOL(__sk_backlog_rcv);
static int sock_get_timeout(long timeo, void *optval, bool old_timeval) static int sock_get_timeout(long timeo, void *optval, bool old_timeval)
{ {
struct __kernel_sock_timeval tv; struct __kernel_sock_timeval tv;
int size;
if (timeo == MAX_SCHEDULE_TIMEOUT) { if (timeo == MAX_SCHEDULE_TIMEOUT) {
tv.tv_sec = 0; 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_sec = tv.tv_sec;
old_tv.tv_usec = tv.tv_usec; old_tv.tv_usec = tv.tv_usec;
*(struct __kernel_old_timeval *)optval = old_tv; *(struct __kernel_old_timeval *)optval = old_tv;
size = sizeof(old_tv); return sizeof(old_tv);
} else {
*(struct __kernel_sock_timeval *)optval = tv;
size = sizeof(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) static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen, bool old_timeval)