| Message ID | 1226415403.31699.0.camel@ecld0pohly |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Patrick Ohly <patrick.ohly@intel.com> Date: Wed, 22 Oct 2008 14:46:39 +0200 > 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> I've applied this to net-2.6 as really this is a correction. Thanks! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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> --- net/compat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)