Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4768fbcbcfbbcacb785ae08eef33767a0b4fdcdd
Commit: 4768fbcbcfbbcacb785ae08eef33767a0b4fdcdd
Parent: a716c1197d608c55adfba45692a890ca64e10df0
Author: YOSHIFUJI Hideaki <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 9 23:25:31 2007 +0900
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sat Feb 10 23:20:27 2007 -0800
[NET]: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
net/compat.c | 16 ++++++++--------
net/socket.c | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/net/compat.c b/net/compat.c
index 52d32f1..9c97074 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -1,4 +1,4 @@
-/*
+/*
* 32bit Socket syscall emulation. Based on arch/sparc64/kernel/sys_sparc32.c.
*
* Copyright (C) 2000 VA Linux Co
@@ -8,7 +8,7 @@
* Copyright (C) 1997 David S. Miller ([EMAIL PROTECTED])
* Copyright (C) 2000 Hewlett-Packard Co.
* Copyright (C) 2000 David Mosberger-Tang <[EMAIL PROTECTED]>
- * Copyright (C) 2000,2001 Andi Kleen, SuSE Labs
+ * Copyright (C) 2000,2001 Andi Kleen, SuSE Labs
*/
#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. */
}
- if (level == SOL_SOCKET && type == SO_TIMESTAMP) {
+ if (level == SOL_SOCKET && type == SO_TIMESTAMP) {
struct timeval *tv = (struct timeval *)data;
ctv.tv_sec = tv->tv_sec;
ctv.tv_usec = tv->tv_usec;
data = &ctv;
len = sizeof(struct compat_timeval);
- }
-
+ }
+
cmlen = CMSG_COMPAT_LEN(len);
if(kmsg->msg_controllen < cmlen) {
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)
{
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;
u16 len;
@@ -610,14 +610,14 @@ asmlinkage long compat_sys_socketcall(int call, u32
__user *args)
int ret;
u32 a[6];
u32 a0, a1;
-
+
if (call < SYS_SOCKET || call > SYS_RECVMSG)
return -EINVAL;
if (copy_from_user(a, args, nas[call]))
return -EFAULT;
a0 = a[0];
a1 = a[1];
-
+
switch(call) {
case SYS_SOCKET:
ret = sys_socket(a0, a1, a[2]);
diff --git a/net/socket.c b/net/socket.c
index 5f374e1..a92f595 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2180,7 +2180,7 @@ done:
}
int kernel_connect(struct socket *sock, struct sockaddr *addr, int addrlen,
- int flags)
+ int flags)
{
return sock->ops->connect(sock, addr, addrlen, flags);
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
