aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2008-11-12 01:54:56 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-12 01:54:56 -0800
commitd35aac10eb7bcb3b80bef16b60844af0313f47f7 (patch)
tree643428ea3f2d78cf9feb7470d812818f4a8dc690 /net
parent8f65b5354b1a34a536641bd915958662e8af5320 (diff)
downloadkernel_samsung_smdk4412-d35aac10eb7bcb3b80bef16b60844af0313f47f7.zip
kernel_samsung_smdk4412-d35aac10eb7bcb3b80bef16b60844af0313f47f7.tar.gz
kernel_samsung_smdk4412-d35aac10eb7bcb3b80bef16b60844af0313f47f7.tar.bz2
net: put_cmsg_compat + SO_TIMESTAMP[NS]: use same name for value as caller
In __sock_recv_timestamp() the additional SCM_TIMESTAMP[NS] is used. This has the same value as SO_TIMESTAMP[NS], so this is a purely cosmetic change. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/compat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/compat.c b/net/compat.c
index 67fb6a3..6ce1a1c 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -226,14 +226,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 == SCM_TIMESTAMP) {
struct timeval *tv = (struct timeval *)data;
ctv.tv_sec = tv->tv_sec;
ctv.tv_usec = tv->tv_usec;
data = &ctv;
len = sizeof(ctv);
}
- if (level == SOL_SOCKET && type == SO_TIMESTAMPNS) {
+ if (level == SOL_SOCKET && type == SCM_TIMESTAMPNS) {
struct timespec *ts = (struct timespec *)data;
cts.tv_sec = ts->tv_sec;
cts.tv_nsec = ts->tv_nsec;