diff for duplicates of <20190202153454.7121-5-deepa.kernel@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 7223037..f60ce37 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -287,19 +287,19 @@ index ce8f6e8cdcd2..ccf93cd0e49b 100644 } if (!COMPAT_USE_64BIT_TIME) { -- if (level == SOL_SOCKET && type == SCM_TIMESTAMP) { -+ if (level == SOL_SOCKET && type == SO_TIMESTAMP_OLD) { +- if (level = SOL_SOCKET && type = SCM_TIMESTAMP) { ++ if (level = SOL_SOCKET && type = SO_TIMESTAMP_OLD) { struct timeval *tv = (struct timeval *)data; ctv.tv_sec = tv->tv_sec; ctv.tv_usec = tv->tv_usec; @@ -227,8 +227,8 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat len = sizeof(ctv); } - if (level == SOL_SOCKET && -- (type == SCM_TIMESTAMPNS || type == SCM_TIMESTAMPING)) { -- int count = type == SCM_TIMESTAMPNS ? 1 : 3; -+ (type == SO_TIMESTAMPNS_OLD || type == SO_TIMESTAMPING_OLD)) { -+ int count = type == SO_TIMESTAMPNS_OLD ? 1 : 3; + if (level = SOL_SOCKET && +- (type = SCM_TIMESTAMPNS || type = SCM_TIMESTAMPING)) { +- int count = type = SCM_TIMESTAMPNS ? 1 : 3; ++ (type = SO_TIMESTAMPNS_OLD || type = SO_TIMESTAMPING_OLD)) { ++ int count = type = SO_TIMESTAMPNS_OLD ? 1 : 3; int i; struct timespec *ts = (struct timespec *)data; for (i = 0; i < count; i++) { @@ -316,8 +316,8 @@ index 29c0028df5ae..d5ca8641968f 100644 + case SO_TIMESTAMP_OLD: + case SO_TIMESTAMPNS_OLD: if (valbool) { -- if (optname == SO_TIMESTAMP) -+ if (optname == SO_TIMESTAMP_OLD) +- if (optname = SO_TIMESTAMP) ++ if (optname = SO_TIMESTAMP_OLD) sock_reset_flag(sk, SOCK_RCVTSTAMPNS); else sock_set_flag(sk, SOCK_RCVTSTAMPNS); diff --git a/a/content_digest b/N1/content_digest index 65162d0..0d9f5af 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190202153454.7121-1-deepa.kernel@gmail.com\0" "From\0Deepa Dinamani <deepa.kernel@gmail.com>\0" "Subject\0[PATCH net-next v5 04/12] sockopt: Rename SO_TIMESTAMP* to SO_TIMESTAMP*_OLD\0" - "Date\0Sat, 2 Feb 2019 07:34:46 -0800\0" + "Date\0Sat, 02 Feb 2019 15:34:46 +0000\0" "To\0davem@davemloft.net" " linux-kernel@vger.kernel.org\0" "Cc\0netdev@vger.kernel.org" @@ -310,19 +310,19 @@ " \t}\n" " \n" " \tif (!COMPAT_USE_64BIT_TIME) {\n" - "-\t\tif (level == SOL_SOCKET && type == SCM_TIMESTAMP) {\n" - "+\t\tif (level == SOL_SOCKET && type == SO_TIMESTAMP_OLD) {\n" + "-\t\tif (level = SOL_SOCKET && type = SCM_TIMESTAMP) {\n" + "+\t\tif (level = SOL_SOCKET && type = SO_TIMESTAMP_OLD) {\n" " \t\t\tstruct timeval *tv = (struct timeval *)data;\n" " \t\t\tctv.tv_sec = tv->tv_sec;\n" " \t\t\tctv.tv_usec = tv->tv_usec;\n" "@@ -227,8 +227,8 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat\n" " \t\t\tlen = sizeof(ctv);\n" " \t\t}\n" - " \t\tif (level == SOL_SOCKET &&\n" - "-\t\t (type == SCM_TIMESTAMPNS || type == SCM_TIMESTAMPING)) {\n" - "-\t\t\tint count = type == SCM_TIMESTAMPNS ? 1 : 3;\n" - "+\t\t (type == SO_TIMESTAMPNS_OLD || type == SO_TIMESTAMPING_OLD)) {\n" - "+\t\t\tint count = type == SO_TIMESTAMPNS_OLD ? 1 : 3;\n" + " \t\tif (level = SOL_SOCKET &&\n" + "-\t\t (type = SCM_TIMESTAMPNS || type = SCM_TIMESTAMPING)) {\n" + "-\t\t\tint count = type = SCM_TIMESTAMPNS ? 1 : 3;\n" + "+\t\t (type = SO_TIMESTAMPNS_OLD || type = SO_TIMESTAMPING_OLD)) {\n" + "+\t\t\tint count = type = SO_TIMESTAMPNS_OLD ? 1 : 3;\n" " \t\t\tint i;\n" " \t\t\tstruct timespec *ts = (struct timespec *)data;\n" " \t\t\tfor (i = 0; i < count; i++) {\n" @@ -339,8 +339,8 @@ "+\tcase SO_TIMESTAMP_OLD:\n" "+\tcase SO_TIMESTAMPNS_OLD:\n" " \t\tif (valbool) {\n" - "-\t\t\tif (optname == SO_TIMESTAMP)\n" - "+\t\t\tif (optname == SO_TIMESTAMP_OLD)\n" + "-\t\t\tif (optname = SO_TIMESTAMP)\n" + "+\t\t\tif (optname = SO_TIMESTAMP_OLD)\n" " \t\t\t\tsock_reset_flag(sk, SOCK_RCVTSTAMPNS);\n" " \t\t\telse\n" " \t\t\t\tsock_set_flag(sk, SOCK_RCVTSTAMPNS);\n" @@ -490,4 +490,4 @@ "-- \n" 2.17.1 -d80609d3bc9bb21eef9405cd5e4cc713a018841a1866af366de823a5c2b41869 +f4d5510455609168bf0d7899a3741b11af5778bb18f7277418c3d8ed675cd1fd
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.