diff for duplicates of <20190202153454.7121-9-deepa.kernel@gmail.com> diff --git a/a/1.txt b/N1/1.txt index b012cba..9332ded 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -55,12 +55,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 @@ -89,12 +89,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 @@ -123,12 +123,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 @@ -157,12 +157,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 @@ -238,13 +238,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 @@ -262,13 +262,13 @@ index d5ca8641968f..14b987eab10c 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); @@ -369,7 +369,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) @@ -424,8 +424,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 6a60df1..01538f1 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 08/12] socket: Add SO_TIMESTAMP[NS]_NEW\0" - "Date\0Sat, 2 Feb 2019 07:34:50 -0800\0" + "Date\0Sat, 02 Feb 2019 15:34:50 +0000\0" "To\0davem@davemloft.net" " linux-kernel@vger.kernel.org\0" "Cc\0netdev@vger.kernel.org" @@ -74,12 +74,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" @@ -108,12 +108,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" @@ -142,12 +142,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" @@ -176,12 +176,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" @@ -257,13 +257,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" @@ -281,13 +281,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" @@ -388,7 +388,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" @@ -443,8 +443,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" @@ -489,4 +488,4 @@ "-- \n" 2.17.1 -fb8c0b438847d401345c88aa2341ce0568232fa42a908c67841f963ad23902bf +a0ee1b18c3d0d2643693ffa2f61154b5482ac5e18febba577f66ae44628f3a76
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.