diff for duplicates of <20190201154356.15536-9-deepa.kernel@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 520ce68..867e5a5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -54,12 +54,12 @@ index 992a0a6dcea1..aab11eec7c22 100644 -#define SO_TIMESTAMP SO_TIMESTAMP_OLD -#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD -+#if __BITS_PER_LONG == 64 ++#if __BITS_PER_LONG = 64 +#define SO_TIMESTAMP SO_TIMESTAMP_OLD +#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD +#else -+#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) -+#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) ++#define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) ++#define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) +#endif + #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -88,12 +88,12 @@ index 0f4516c34df2..11014f684d9f 100644 -#define SO_TIMESTAMP SO_TIMESTAMP_OLD -#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD -+#if __BITS_PER_LONG == 64 ++#if __BITS_PER_LONG = 64 +#define SO_TIMESTAMP SO_TIMESTAMP_OLD +#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD +#else -+#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) -+#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) ++#define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) ++#define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) +#endif + #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -122,12 +122,12 @@ index 7c180321ebd6..cbc4b89c2fe4 100644 -#define SO_TIMESTAMP SO_TIMESTAMP_OLD -#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD -+#if __BITS_PER_LONG == 64 ++#if __BITS_PER_LONG = 64 +#define SO_TIMESTAMP SO_TIMESTAMP_OLD +#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD +#else -+#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) -+#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) ++#define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) ++#define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) +#endif + #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -156,12 +156,12 @@ index d8a1bbc3e6c4..85127425b294 100644 -#define SO_TIMESTAMP SO_TIMESTAMP_OLD -#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD -+#if __BITS_PER_LONG == 64 ++#if __BITS_PER_LONG = 64 +#define SO_TIMESTAMP SO_TIMESTAMP_OLD +#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD +#else -+#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) -+#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) ++#define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) ++#define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) +#endif + #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -237,13 +237,13 @@ index 4ef3aed31fb7..f22d3f7162f8 100644 -#define SO_TIMESTAMP SO_TIMESTAMP_OLD -#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD -+#if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__)) ++#if __BITS_PER_LONG = 64 || (defined(__x86_64__) && defined(__ILP32__)) +/* on 64-bit and x32, avoid the ?: operator */ +#define SO_TIMESTAMP SO_TIMESTAMP_OLD +#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD +#else -+#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) -+#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) ++#define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) ++#define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) +#endif + #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -261,13 +261,13 @@ index 5c38c740131d..1b992d10d5d6 100644 case SO_TIMESTAMPNS_OLD: + case SO_TIMESTAMPNS_NEW: if (valbool) { -- if (optname == SO_TIMESTAMP_OLD) -+ if (optname == SO_TIMESTAMP_NEW || optname == SO_TIMESTAMPNS_NEW) +- if (optname = SO_TIMESTAMP_OLD) ++ if (optname = SO_TIMESTAMP_NEW || optname = SO_TIMESTAMPNS_NEW) + sock_set_flag(sk, SOCK_TSTAMP_NEW); + else + sock_reset_flag(sk, SOCK_TSTAMP_NEW); + -+ if (optname == SO_TIMESTAMP_OLD || optname == SO_TIMESTAMP_NEW) ++ if (optname = SO_TIMESTAMP_OLD || optname = SO_TIMESTAMP_NEW) sock_reset_flag(sk, SOCK_RCVTSTAMPNS); else sock_set_flag(sk, SOCK_RCVTSTAMPNS); @@ -368,7 +368,7 @@ index eeb4639adbe5..65571a6273c3 100644 valbool = val ? 1 : 0; -+ if (optname == SO_TIMESTAMP_NEW) ++ if (optname = SO_TIMESTAMP_NEW) + sock_set_flag(sk, SOCK_TSTAMP_NEW); + if (valbool) @@ -423,8 +423,7 @@ index 9cc281cdb9d9..1de96abd78d3 100644 + int new_tstamp = sock_flag(sk, SOCK_TSTAMP_NEW); struct scm_timestamping tss; int empty = 1, false_tstamp = 0; - struct skb_shared_hwtstamps *shhwtstamps = -@@ -719,15 +720,33 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk, + struct skb_shared_hwtstamps *shhwtstamps @@ -719,15 +720,33 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk, if (need_software_tstamp) { if (!sock_flag(sk, SOCK_RCVTSTAMPNS)) { diff --git a/a/content_digest b/N1/content_digest index 4c5c87b..e4bb6ee 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190201154356.15536-1-deepa.kernel@gmail.com\0" "From\0Deepa Dinamani <deepa.kernel@gmail.com>\0" "Subject\0[PATCH net-next v4 08/12] socket: Add SO_TIMESTAMP[NS]_NEW\0" - "Date\0Fri, 1 Feb 2019 07:43:52 -0800\0" + "Date\0Fri, 01 Feb 2019 15:43:52 +0000\0" "To\0davem@davemloft.net" " linux-kernel@vger.kernel.org\0" "Cc\0netdev@vger.kernel.org" @@ -73,12 +73,12 @@ " \n" "-#define SO_TIMESTAMP SO_TIMESTAMP_OLD\n" "-#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD\n" - "+#if __BITS_PER_LONG == 64\n" + "+#if __BITS_PER_LONG = 64\n" "+#define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" "+#define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" "+#else\n" - "+#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - "+#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + "+#define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + "+#define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" "+#endif\n" "+\n" " #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -107,12 +107,12 @@ " \n" "-#define SO_TIMESTAMP SO_TIMESTAMP_OLD\n" "-#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD\n" - "+#if __BITS_PER_LONG == 64\n" + "+#if __BITS_PER_LONG = 64\n" "+#define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" "+#define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" "+#else\n" - "+#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - "+#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + "+#define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + "+#define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" "+#endif\n" "+\n" " #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -141,12 +141,12 @@ " \n" "-#define SO_TIMESTAMP SO_TIMESTAMP_OLD\n" "-#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD\n" - "+#if __BITS_PER_LONG == 64\n" + "+#if __BITS_PER_LONG = 64\n" "+#define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" "+#define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" "+#else\n" - "+#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - "+#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + "+#define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + "+#define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" "+#endif\n" "+\n" " #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -175,12 +175,12 @@ " \n" "-#define SO_TIMESTAMP SO_TIMESTAMP_OLD\n" "-#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD\n" - "+#if __BITS_PER_LONG == 64\n" + "+#if __BITS_PER_LONG = 64\n" "+#define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" "+#define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" "+#else\n" - "+#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - "+#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + "+#define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + "+#define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" "+#endif\n" "+\n" " #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -256,13 +256,13 @@ " \n" "-#define SO_TIMESTAMP SO_TIMESTAMP_OLD\n" "-#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD\n" - "+#if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))\n" + "+#if __BITS_PER_LONG = 64 || (defined(__x86_64__) && defined(__ILP32__))\n" "+/* on 64-bit and x32, avoid the ?: operator */\n" "+#define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" "+#define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" "+#else\n" - "+#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - "+#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + "+#define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + "+#define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" "+#endif\n" "+\n" " #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -280,13 +280,13 @@ " \tcase SO_TIMESTAMPNS_OLD:\n" "+\tcase SO_TIMESTAMPNS_NEW:\n" " \t\tif (valbool) {\n" - "-\t\t\tif (optname == SO_TIMESTAMP_OLD)\n" - "+\t\t\tif (optname == SO_TIMESTAMP_NEW || optname == SO_TIMESTAMPNS_NEW)\n" + "-\t\t\tif (optname = SO_TIMESTAMP_OLD)\n" + "+\t\t\tif (optname = SO_TIMESTAMP_NEW || optname = SO_TIMESTAMPNS_NEW)\n" "+\t\t\t\tsock_set_flag(sk, SOCK_TSTAMP_NEW);\n" "+\t\t\telse\n" "+\t\t\t\tsock_reset_flag(sk, SOCK_TSTAMP_NEW);\n" "+\n" - "+\t\t\tif (optname == SO_TIMESTAMP_OLD || optname == SO_TIMESTAMP_NEW)\n" + "+\t\t\tif (optname = SO_TIMESTAMP_OLD || optname = SO_TIMESTAMP_NEW)\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" @@ -387,7 +387,7 @@ " \n" " \tvalbool = val ? 1 : 0;\n" " \n" - "+\tif (optname == SO_TIMESTAMP_NEW)\n" + "+\tif (optname = SO_TIMESTAMP_NEW)\n" "+\t\tsock_set_flag(sk, SOCK_TSTAMP_NEW);\n" "+\n" " \tif (valbool)\n" @@ -442,8 +442,7 @@ "+\tint new_tstamp = sock_flag(sk, SOCK_TSTAMP_NEW);\n" " \tstruct scm_timestamping tss;\n" " \tint empty = 1, false_tstamp = 0;\n" - " \tstruct skb_shared_hwtstamps *shhwtstamps =\n" - "@@ -719,15 +720,33 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,\n" + " \tstruct skb_shared_hwtstamps *shhwtstamps @@ -719,15 +720,33 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,\n" " \n" " \tif (need_software_tstamp) {\n" " \t\tif (!sock_flag(sk, SOCK_RCVTSTAMPNS)) {\n" @@ -488,4 +487,4 @@ "-- \n" 2.17.1 -83693501f1273d460fbab6b4d527eefc4e06f6e496af726396634d1cbac6121b +87a6bf2d17563761b0a0ef9624b5f8ad796a067eceb5885352a7e6c2cc28151c
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.