net: fix sparc64 compilation of sock_gettstamp
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Apr 2019 07:25:24 +0000 (17:25 +1000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 Apr 2019 01:35:17 +0000 (18:35 -0700)
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>
net/core/sock.c

index 443b98d..925b84a 100644 (file)
@@ -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;
        }