diff --git a/[refs] b/[refs] index 852f02b5a401..033b623448f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f65b5354b1a34a536641bd915958662e8af5320 +refs/heads/master: d35aac10eb7bcb3b80bef16b60844af0313f47f7 diff --git a/trunk/net/compat.c b/trunk/net/compat.c index 67fb6a3834a3..6ce1a1cadcc0 100644 --- a/trunk/net/compat.c +++ b/trunk/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;