aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/sock.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2019-04-23 17:25:24 +1000
committerDavid S. Miller <davem@davemloft.net>2019-04-23 18:35:17 -0700
commitc98f4822ed7e02ff91fd29707218779718cf60f9 (patch)
treea3b88287711fa83c4d64a6f2e7a39f2b5837b9af /net/core/sock.c
parentisdn:mISDN: fix misuse of %x in hfcpci.c (diff)
downloadlinux-dev-c98f4822ed7e02ff91fd29707218779718cf60f9.tar.xz
linux-dev-c98f4822ed7e02ff91fd29707218779718cf60f9.zip
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: c7cbdbf29f48 ("net: rework SIOCGSTAMP ioctl handling") Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
-rw-r--r--net/core/sock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 443b98d05f1e..925b84a872dd 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -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;
}