Commit c98f4822 authored Apr 23, 2019 by Stephen Rothwell Committed by David S. Miller Apr 23, 2019

net: fix sparc64 compilation of sock_gettstamp



net/core/sock.c: In function 'sock_gettstamp':
net/core/sock.c:3007:23: error: expected '}' before ';' token
    .tv_sec = ts.tv_sec;
                       ^
net/core/sock.c:3011:4: error: expected ')' before 'return'
    return -EFAULT;
    ^~~~~~
net/core/sock.c:3013:2: error: expected expression before '}' token
  }
  ^

Fixes: c7cbdbf2 ("net: rework SIOCGSTAMP ioctl handling")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0fa4122b

net/core/sock.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -3004,10 +3004,10 @@ int sock_gettstamp(struct socket sock, void __user userstamp,
		/* beware of padding in sparc64 timeval */
		if (timeval && !in_compat_syscall()) {
		struct __kernel_old_timeval __user tv = {
		.tv_sec = ts.tv_sec;
		.tv_usec = ts.tv_nsec;
		.tv_sec = ts.tv_sec,
		.tv_usec = ts.tv_nsec,
		};
		if (copy_to_user(userstamp, &tv, sizeof(tv))
		if (copy_to_user(userstamp, &tv, sizeof(tv)))
		return -EFAULT;
		return 0;
		}

Admin message