UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[NET]: Fix whitespace errors. 

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki 2007-02-09 23:25:31 +09:00 committed by David S. Miller
parent a716c1197d
commit 4768fbcbcf
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/compat.c
View File

@ -1,4 +1,4 @@
/* /*
* 32bit Socket syscall emulation. Based on arch/sparc64/kernel/sys_sparc32.c. * 32bit Socket syscall emulation. Based on arch/sparc64/kernel/sys_sparc32.c.
* *
* Copyright (C) 2000 VA Linux Co * Copyright (C) 2000 VA Linux Co
@ -8,7 +8,7 @@
* Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
* Copyright (C) 2000 Hewlett-Packard Co. * Copyright (C) 2000 Hewlett-Packard Co.
* Copyright (C) 2000 David Mosberger-Tang <davidm@hpl.hp.com> * Copyright (C) 2000 David Mosberger-Tang <davidm@hpl.hp.com>
* Copyright (C) 2000,2001 Andi Kleen, SuSE Labs * Copyright (C) 2000,2001 Andi Kleen, SuSE Labs
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
@ -225,14 +225,14 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
return 0; /* XXX: return error? check spec. */ return 0; /* XXX: return error? check spec. */
} }
if (level == SOL_SOCKET && type == SO_TIMESTAMP) { if (level == SOL_SOCKET && type == SO_TIMESTAMP) {
struct timeval *tv = (struct timeval *)data; struct timeval *tv = (struct timeval *)data;
ctv.tv_sec = tv->tv_sec; ctv.tv_sec = tv->tv_sec;
ctv.tv_usec = tv->tv_usec; ctv.tv_usec = tv->tv_usec;
data = &ctv; data = &ctv;
len = sizeof(struct compat_timeval); len = sizeof(struct compat_timeval);
} }
cmlen = CMSG_COMPAT_LEN(len); cmlen = CMSG_COMPAT_LEN(len);
if(kmsg->msg_controllen < cmlen) { if(kmsg->msg_controllen < cmlen) {
kmsg->msg_flags |= MSG_CTRUNC; kmsg->msg_flags |= MSG_CTRUNC;
@ -419,7 +419,7 @@ static int do_set_attach_filter(struct socket *sock, int level, int optname,
char __user *optval, int optlen) char __user *optval, int optlen)
{ {
struct compat_sock_fprog __user *fprog32 = (struct compat_sock_fprog __user *)optval; struct compat_sock_fprog __user *fprog32 = (struct compat_sock_fprog __user *)optval;
struct sock_fprog __user *kfprog = compat_alloc_user_space(sizeof(struct sock_fprog)); struct sock_fprog __user *kfprog = compat_alloc_user_space(sizeof(struct sock_fprog));
compat_uptr_t ptr; compat_uptr_t ptr;
u16 len; u16 len;
@ -610,14 +610,14 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
int ret; int ret;
u32 a[6]; u32 a[6];
u32 a0, a1; u32 a0, a1;
if (call < SYS_SOCKET || call > SYS_RECVMSG) if (call < SYS_SOCKET || call > SYS_RECVMSG)
return -EINVAL; return -EINVAL;
if (copy_from_user(a, args, nas[call])) if (copy_from_user(a, args, nas[call]))
return -EFAULT; return -EFAULT;
a0 = a[0]; a0 = a[0];
a1 = a[1]; a1 = a[1];
switch(call) { switch(call) {
case SYS_SOCKET: case SYS_SOCKET:
ret = sys_socket(a0, a1, a[2]); ret = sys_socket(a0, a1, a[2]);

2
net/socket.c
View File

@ -2180,7 +2180,7 @@ done:
} }
int kernel_connect(struct socket *sock, struct sockaddr *addr, int addrlen, int kernel_connect(struct socket *sock, struct sockaddr *addr, int addrlen,
int flags) int flags)
{ {
return sock->ops->connect(sock, addr, addrlen, flags); return sock->ops->connect(sock, addr, addrlen, flags);
} }