diff for duplicates of <20190108032657.8331-8-deepa.kernel@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 2ea61ff..3a02da7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -42,14 +42,14 @@ index 352e3dc0b3d9..da08412bd49f 100644 #if !defined(__KERNEL__) - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD +#define SO_TIMESTAMPING SO_TIMESTAMPING_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_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_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) ++#define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) #endif -#define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -69,14 +69,14 @@ index d1752e3f1248..1e48f67f1052 100644 #if !defined(__KERNEL__) - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD +#define SO_TIMESTAMPING SO_TIMESTAMPING_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_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_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) ++#define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) #endif -#define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -96,14 +96,14 @@ index 0a45b668abd1..e8d6cf20f9a4 100644 #if !defined(__KERNEL__) - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD +#define SO_TIMESTAMPING SO_TIMESTAMPING_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_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_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) ++#define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) #endif -#define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -127,14 +127,14 @@ index dc8527cae5a7..fc65bf6b6440 100644 #if !defined(__KERNEL__) - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD +#define SO_TIMESTAMPING SO_TIMESTAMPING_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_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_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) ++#define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) #endif -#define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -159,7 +159,7 @@ index ab2041a00e01..a47e60a1cfdf 100644 +extern void put_cmsg_scm_timestamping(struct msghdr *msg, struct scm_timestamping_internal *tss); /* The __sys_...msg variants allow MSG_CMSG_COMPAT iff - * forbid_cmsg_compat==false + * forbid_cmsg_compat=false diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h index 0b0fae6b57a9..94e618a4a43f 100644 --- a/include/uapi/asm-generic/socket.h @@ -178,9 +178,9 @@ index 0b0fae6b57a9..94e618a4a43f 100644 #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD +#define SO_TIMESTAMPING SO_TIMESTAMPING_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_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_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) ++#define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) #endif -#define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -267,7 +267,7 @@ index 35c7cd9b2793..78df5228ffbd 100644 SOCK_TIMESTAMPING_RX_SOFTWARE); - else + else { -+ if (optname == SO_TIMESTAMPING_NEW) ++ if (optname = SO_TIMESTAMPING_NEW) + sock_reset_flag(sk, SOCK_TSTAMP_NEW); + sock_disable_timestamp(sk, @@ -381,8 +381,7 @@ index 1de96abd78d3..d51930689b98 100644 + struct scm_timestamping_internal tss; + int empty = 1, false_tstamp = 0; - struct skb_shared_hwtstamps *shhwtstamps = - skb_hwtstamps(skb); + struct skb_shared_hwtstamps *shhwtstamps skb_hwtstamps(skb); @@ -752,20 +753,22 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk, memset(&tss, 0, sizeof(tss)); diff --git a/a/content_digest b/N1/content_digest index efee8fc..496734f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190108032657.8331-1-deepa.kernel@gmail.com\0" "From\0Deepa Dinamani <deepa.kernel@gmail.com>\0" "Subject\0[PATCH v3 7/8] socket: Add SO_TIMESTAMPING_NEW\0" - "Date\0Mon, 7 Jan 2019 19:26:56 -0800\0" + "Date\0Tue, 08 Jan 2019 03:26:56 +0000\0" "To\0davem@davemloft.net" " linux-kernel@vger.kernel.org\0" "Cc\0netdev@vger.kernel.org" @@ -65,14 +65,14 @@ " \n" " #if !defined(__KERNEL__)\n" " \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" "+#define SO_TIMESTAMPING\tSO_TIMESTAMPING_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_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_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" + "+#define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" " #endif\n" " \n" "-#define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -92,14 +92,14 @@ " \n" " #if !defined(__KERNEL__)\n" " \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" "+#define SO_TIMESTAMPING\tSO_TIMESTAMPING_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_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_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" + "+#define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" " #endif\n" " \n" "-#define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -119,14 +119,14 @@ " \n" " #if !defined(__KERNEL__)\n" " \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" "+#define SO_TIMESTAMPING\tSO_TIMESTAMPING_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_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_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" + "+#define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" " #endif\n" " \n" "-#define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -150,14 +150,14 @@ " \n" " #if !defined(__KERNEL__)\n" " \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" "+#define SO_TIMESTAMPING\tSO_TIMESTAMPING_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_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_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" + "+#define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" " #endif\n" " \n" "-#define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -182,7 +182,7 @@ "+extern void put_cmsg_scm_timestamping(struct msghdr *msg, struct scm_timestamping_internal *tss);\n" " \n" " /* The __sys_...msg variants allow MSG_CMSG_COMPAT iff\n" - " * forbid_cmsg_compat==false\n" + " * forbid_cmsg_compat=false\n" "diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h\n" "index 0b0fae6b57a9..94e618a4a43f 100644\n" "--- a/include/uapi/asm-generic/socket.h\n" @@ -201,9 +201,9 @@ " #define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" "+#define SO_TIMESTAMPING\tSO_TIMESTAMPING_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_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_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" + "+#define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" " #endif\n" " \n" "-#define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -290,7 +290,7 @@ " \t\t\t\t\t SOCK_TIMESTAMPING_RX_SOFTWARE);\n" "-\t\telse\n" "+\t\telse {\n" - "+\t\t\tif (optname == SO_TIMESTAMPING_NEW)\n" + "+\t\t\tif (optname = SO_TIMESTAMPING_NEW)\n" "+\t\t\t\tsock_reset_flag(sk, SOCK_TSTAMP_NEW);\n" "+\n" " \t\t\tsock_disable_timestamp(sk,\n" @@ -404,8 +404,7 @@ "+\tstruct scm_timestamping_internal tss;\n" "+\n" " \tint empty = 1, false_tstamp = 0;\n" - " \tstruct skb_shared_hwtstamps *shhwtstamps =\n" - " \t\tskb_hwtstamps(skb);\n" + " \tstruct skb_shared_hwtstamps *shhwtstamps \t\tskb_hwtstamps(skb);\n" "@@ -752,20 +753,22 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,\n" " \n" " \tmemset(&tss, 0, sizeof(tss));\n" @@ -436,4 +435,4 @@ "-- \n" 2.17.1 -6011a4d0c101d1b0d41ee8668bd69f2773f6971d038dfaf5cc74065ce1dfe257 +32351b61c31fa0675424cb8aef109d8eab6101d68c06ca53f2c94bcb222b0296
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.