diff for duplicates of <20190108052255.10699-3-deepa.kernel@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 149521c..3b515d6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,18 +7,18 @@ right option is enabled for userspace applications according to the architecture and time_t definition of libc. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> -Cc: ccaulfie at redhat.com -Cc: deller at gmx.de -Cc: paulus at samba.org -Cc: ralf at linux-mips.org -Cc: rth at twiddle.net -Cc: cluster-devel at redhat.com -Cc: linuxppc-dev at lists.ozlabs.org -Cc: linux-alpha at vger.kernel.org -Cc: linux-arch at vger.kernel.org -Cc: linux-mips at vger.kernel.org -Cc: linux-parisc at vger.kernel.org -Cc: sparclinux at vger.kernel.org +Cc: ccaulfie@redhat.com +Cc: deller@gmx.de +Cc: paulus@samba.org +Cc: ralf@linux-mips.org +Cc: rth@twiddle.net +Cc: cluster-devel@redhat.com +Cc: linuxppc-dev@lists.ozlabs.org +Cc: linux-alpha@vger.kernel.org +Cc: linux-arch@vger.kernel.org +Cc: linux-mips@vger.kernel.org +Cc: linux-parisc@vger.kernel.org +Cc: sparclinux@vger.kernel.org --- arch/alpha/include/uapi/asm/socket.h | 7 +++++-- arch/mips/include/uapi/asm/socket.h | 6 ++++-- diff --git a/a/content_digest b/N1/content_digest index 454e622..d254783 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,24 @@ "ref\020190108052255.10699-1-deepa.kernel@gmail.com\0" "From\0Deepa Dinamani <deepa.kernel@gmail.com>\0" - "Subject\0[Cluster-devel] [PATCH 2/3] socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes\0" + "Subject\0[PATCH 2/3] socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes\0" "Date\0Mon, 7 Jan 2019 21:22:54 -0800\0" - "To\0cluster-devel.redhat.com\0" + "To\0davem@davemloft.net" + " linux-kernel@vger.kernel.org\0" + "Cc\0netdev@vger.kernel.org" + arnd@arndb.de + y2038@lists.linaro.org + ccaulfie@redhat.com + deller@gmx.de + paulus@samba.org + ralf@linux-mips.org + rth@twiddle.net + cluster-devel@redhat.com + linuxppc-dev@lists.ozlabs.org + linux-alpha@vger.kernel.org + linux-arch@vger.kernel.org + linux-mips@vger.kernel.org + linux-parisc@vger.kernel.org + " sparclinux@vger.kernel.org\0" "\00:1\0" "b\0" "SO_RCVTIMEO and SO_SNDTIMEO socket options use struct timeval\n" @@ -14,18 +30,18 @@ "to the architecture and time_t definition of libc.\n" "\n" "Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>\n" - "Cc: ccaulfie at redhat.com\n" - "Cc: deller at gmx.de\n" - "Cc: paulus at samba.org\n" - "Cc: ralf at linux-mips.org\n" - "Cc: rth at twiddle.net\n" - "Cc: cluster-devel at redhat.com\n" - "Cc: linuxppc-dev at lists.ozlabs.org\n" - "Cc: linux-alpha at vger.kernel.org\n" - "Cc: linux-arch at vger.kernel.org\n" - "Cc: linux-mips at vger.kernel.org\n" - "Cc: linux-parisc at vger.kernel.org\n" - "Cc: sparclinux at vger.kernel.org\n" + "Cc: ccaulfie@redhat.com\n" + "Cc: deller@gmx.de\n" + "Cc: paulus@samba.org\n" + "Cc: ralf@linux-mips.org\n" + "Cc: rth@twiddle.net\n" + "Cc: cluster-devel@redhat.com\n" + "Cc: linuxppc-dev@lists.ozlabs.org\n" + "Cc: linux-alpha@vger.kernel.org\n" + "Cc: linux-arch@vger.kernel.org\n" + "Cc: linux-mips@vger.kernel.org\n" + "Cc: linux-parisc@vger.kernel.org\n" + "Cc: sparclinux@vger.kernel.org\n" "---\n" " arch/alpha/include/uapi/asm/socket.h | 7 +++++--\n" " arch/mips/include/uapi/asm/socket.h | 6 ++++--\n" @@ -270,4 +286,4 @@ "-- \n" 2.17.1 -e78b531297056e4b43b8d20406f6e03925b26459ad52460fc378870a7e319412 +30a4ce85256015754ecb8b8483de40a1f6b9a0293ec2cc7ee9ef4ddf2c2c8294
diff --git a/a/1.txt b/N2/1.txt index 149521c..3b515d6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -7,18 +7,18 @@ right option is enabled for userspace applications according to the architecture and time_t definition of libc. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> -Cc: ccaulfie at redhat.com -Cc: deller at gmx.de -Cc: paulus at samba.org -Cc: ralf at linux-mips.org -Cc: rth at twiddle.net -Cc: cluster-devel at redhat.com -Cc: linuxppc-dev at lists.ozlabs.org -Cc: linux-alpha at vger.kernel.org -Cc: linux-arch at vger.kernel.org -Cc: linux-mips at vger.kernel.org -Cc: linux-parisc at vger.kernel.org -Cc: sparclinux at vger.kernel.org +Cc: ccaulfie@redhat.com +Cc: deller@gmx.de +Cc: paulus@samba.org +Cc: ralf@linux-mips.org +Cc: rth@twiddle.net +Cc: cluster-devel@redhat.com +Cc: linuxppc-dev@lists.ozlabs.org +Cc: linux-alpha@vger.kernel.org +Cc: linux-arch@vger.kernel.org +Cc: linux-mips@vger.kernel.org +Cc: linux-parisc@vger.kernel.org +Cc: sparclinux@vger.kernel.org --- arch/alpha/include/uapi/asm/socket.h | 7 +++++-- arch/mips/include/uapi/asm/socket.h | 6 ++++-- diff --git a/a/content_digest b/N2/content_digest index 454e622..9efea74 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,24 @@ "ref\020190108052255.10699-1-deepa.kernel@gmail.com\0" "From\0Deepa Dinamani <deepa.kernel@gmail.com>\0" - "Subject\0[Cluster-devel] [PATCH 2/3] socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes\0" + "Subject\0[PATCH 2/3] socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes\0" "Date\0Mon, 7 Jan 2019 21:22:54 -0800\0" - "To\0cluster-devel.redhat.com\0" + "To\0davem@davemloft.net" + " linux-kernel@vger.kernel.org\0" + "Cc\0linux-arch@vger.kernel.org" + linux-parisc@vger.kernel.org + arnd@arndb.de + y2038@lists.linaro.org + netdev@vger.kernel.org + deller@gmx.de + linux-mips@vger.kernel.org + ralf@linux-mips.org + cluster-devel@redhat.com + ccaulfie@redhat.com + paulus@samba.org + linux-alpha@vger.kernel.org + sparclinux@vger.kernel.org + linuxppc-dev@lists.ozlabs.org + " rth@twiddle.net\0" "\00:1\0" "b\0" "SO_RCVTIMEO and SO_SNDTIMEO socket options use struct timeval\n" @@ -14,18 +30,18 @@ "to the architecture and time_t definition of libc.\n" "\n" "Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>\n" - "Cc: ccaulfie at redhat.com\n" - "Cc: deller at gmx.de\n" - "Cc: paulus at samba.org\n" - "Cc: ralf at linux-mips.org\n" - "Cc: rth at twiddle.net\n" - "Cc: cluster-devel at redhat.com\n" - "Cc: linuxppc-dev at lists.ozlabs.org\n" - "Cc: linux-alpha at vger.kernel.org\n" - "Cc: linux-arch at vger.kernel.org\n" - "Cc: linux-mips at vger.kernel.org\n" - "Cc: linux-parisc at vger.kernel.org\n" - "Cc: sparclinux at vger.kernel.org\n" + "Cc: ccaulfie@redhat.com\n" + "Cc: deller@gmx.de\n" + "Cc: paulus@samba.org\n" + "Cc: ralf@linux-mips.org\n" + "Cc: rth@twiddle.net\n" + "Cc: cluster-devel@redhat.com\n" + "Cc: linuxppc-dev@lists.ozlabs.org\n" + "Cc: linux-alpha@vger.kernel.org\n" + "Cc: linux-arch@vger.kernel.org\n" + "Cc: linux-mips@vger.kernel.org\n" + "Cc: linux-parisc@vger.kernel.org\n" + "Cc: sparclinux@vger.kernel.org\n" "---\n" " arch/alpha/include/uapi/asm/socket.h | 7 +++++--\n" " arch/mips/include/uapi/asm/socket.h | 6 ++++--\n" @@ -270,4 +286,4 @@ "-- \n" 2.17.1 -e78b531297056e4b43b8d20406f6e03925b26459ad52460fc378870a7e319412 +f2a95859bed47178de0b460a315538018a3591005b333e28fd9eabe82d74e351
diff --git a/a/1.txt b/N3/1.txt index 149521c..f414970 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -7,18 +7,18 @@ right option is enabled for userspace applications according to the architecture and time_t definition of libc. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> -Cc: ccaulfie at redhat.com -Cc: deller at gmx.de -Cc: paulus at samba.org -Cc: ralf at linux-mips.org -Cc: rth at twiddle.net -Cc: cluster-devel at redhat.com -Cc: linuxppc-dev at lists.ozlabs.org -Cc: linux-alpha at vger.kernel.org -Cc: linux-arch at vger.kernel.org -Cc: linux-mips at vger.kernel.org -Cc: linux-parisc at vger.kernel.org -Cc: sparclinux at vger.kernel.org +Cc: ccaulfie@redhat.com +Cc: deller@gmx.de +Cc: paulus@samba.org +Cc: ralf@linux-mips.org +Cc: rth@twiddle.net +Cc: cluster-devel@redhat.com +Cc: linuxppc-dev@lists.ozlabs.org +Cc: linux-alpha@vger.kernel.org +Cc: linux-arch@vger.kernel.org +Cc: linux-mips@vger.kernel.org +Cc: linux-parisc@vger.kernel.org +Cc: sparclinux@vger.kernel.org --- arch/alpha/include/uapi/asm/socket.h | 7 +++++-- arch/mips/include/uapi/asm/socket.h | 6 ++++-- @@ -54,7 +54,7 @@ index da08412bd49f..ea3ba981d8a0 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD + - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h @@ -78,7 +78,7 @@ index 1e48f67f1052..4dde20d64690 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h @@ -102,7 +102,7 @@ index e8d6cf20f9a4..546937fa0d8b 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD diff --git a/arch/powerpc/include/uapi/asm/socket.h b/arch/powerpc/include/uapi/asm/socket.h @@ -141,7 +141,7 @@ index fc65bf6b6440..bdc396211627 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c @@ -162,7 +162,7 @@ index 76976d6e50f9..c98ad9777ad9 100644 + kernel_setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO_OLD, (char *)&tv, sizeof(tv)); - if (result == -EINPROGRESS) + if (result = -EINPROGRESS) diff --git a/include/net/sock.h b/include/net/sock.h index 6679f3c120b0..98965a9a2bf4 100644 --- a/include/net/sock.h @@ -199,7 +199,7 @@ index 94e618a4a43f..9e370586fb19 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_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 diff --git a/net/compat.c b/net/compat.c @@ -210,8 +210,8 @@ index cbc15f65033c..19e047f70f64 100644 return do_set_attach_filter(sock, level, optname, optval, optlen); if (!COMPAT_USE_64BIT_TIME && -- (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO)) -+ (optname == SO_RCVTIMEO_OLD || optname == SO_SNDTIMEO_OLD)) +- (optname = SO_RCVTIMEO || optname = SO_SNDTIMEO)) ++ (optname = SO_RCVTIMEO_OLD || optname = SO_SNDTIMEO_OLD)) return do_set_sock_timeout(sock, level, optname, optval, optlen); return sock_setsockopt(sock, level, optname, optval, optlen); @@ -219,8 +219,8 @@ index cbc15f65033c..19e047f70f64 100644 char __user *optval, int __user *optlen) { if (!COMPAT_USE_64BIT_TIME && -- (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO)) -+ (optname == SO_RCVTIMEO_OLD || optname == SO_SNDTIMEO_OLD)) +- (optname = SO_RCVTIMEO || optname = SO_SNDTIMEO)) ++ (optname = SO_RCVTIMEO_OLD || optname = SO_SNDTIMEO_OLD)) return do_get_sock_timeout(sock, level, optname, optval, optlen); return sock_getsockopt(sock, level, optname, optval, optlen); } @@ -249,7 +249,7 @@ index af0fb33624e2..42914ca3186c 100644 - case SO_RCVTIMEO: + case SO_RCVTIMEO_OLD: lv = sizeof(struct __kernel_old_timeval); - if (sk->sk_rcvtimeo == MAX_SCHEDULE_TIMEOUT) { + if (sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT) { v.tm.tv_sec = 0; @@ -1233,7 +1233,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, } @@ -258,7 +258,7 @@ index af0fb33624e2..42914ca3186c 100644 - case SO_SNDTIMEO: + case SO_SNDTIMEO_OLD: lv = sizeof(struct __kernel_old_timeval); - if (sk->sk_sndtimeo == MAX_SCHEDULE_TIMEOUT) { + if (sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT) { v.tm.tv_sec = 0; -- 2.17.1 diff --git a/a/content_digest b/N3/content_digest index 454e622..503da8f 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,8 +1,24 @@ "ref\020190108052255.10699-1-deepa.kernel@gmail.com\0" "From\0Deepa Dinamani <deepa.kernel@gmail.com>\0" - "Subject\0[Cluster-devel] [PATCH 2/3] socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes\0" - "Date\0Mon, 7 Jan 2019 21:22:54 -0800\0" - "To\0cluster-devel.redhat.com\0" + "Subject\0[PATCH 2/3] socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes\0" + "Date\0Tue, 08 Jan 2019 05:22:54 +0000\0" + "To\0davem@davemloft.net" + " linux-kernel@vger.kernel.org\0" + "Cc\0netdev@vger.kernel.org" + arnd@arndb.de + y2038@lists.linaro.org + ccaulfie@redhat.com + deller@gmx.de + paulus@samba.org + ralf@linux-mips.org + rth@twiddle.net + cluster-devel@redhat.com + linuxppc-dev@lists.ozlabs.org + linux-alpha@vger.kernel.org + linux-arch@vger.kernel.org + linux-mips@vger.kernel.org + linux-parisc@vger.kernel.org + " sparclinux@vger.kernel.org\0" "\00:1\0" "b\0" "SO_RCVTIMEO and SO_SNDTIMEO socket options use struct timeval\n" @@ -14,18 +30,18 @@ "to the architecture and time_t definition of libc.\n" "\n" "Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>\n" - "Cc: ccaulfie at redhat.com\n" - "Cc: deller at gmx.de\n" - "Cc: paulus at samba.org\n" - "Cc: ralf at linux-mips.org\n" - "Cc: rth at twiddle.net\n" - "Cc: cluster-devel at redhat.com\n" - "Cc: linuxppc-dev at lists.ozlabs.org\n" - "Cc: linux-alpha at vger.kernel.org\n" - "Cc: linux-arch at vger.kernel.org\n" - "Cc: linux-mips at vger.kernel.org\n" - "Cc: linux-parisc at vger.kernel.org\n" - "Cc: sparclinux at vger.kernel.org\n" + "Cc: ccaulfie@redhat.com\n" + "Cc: deller@gmx.de\n" + "Cc: paulus@samba.org\n" + "Cc: ralf@linux-mips.org\n" + "Cc: rth@twiddle.net\n" + "Cc: cluster-devel@redhat.com\n" + "Cc: linuxppc-dev@lists.ozlabs.org\n" + "Cc: linux-alpha@vger.kernel.org\n" + "Cc: linux-arch@vger.kernel.org\n" + "Cc: linux-mips@vger.kernel.org\n" + "Cc: linux-parisc@vger.kernel.org\n" + "Cc: sparclinux@vger.kernel.org\n" "---\n" " arch/alpha/include/uapi/asm/socket.h | 7 +++++--\n" " arch/mips/include/uapi/asm/socket.h | 6 ++++--\n" @@ -61,7 +77,7 @@ "+#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\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" "diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h\n" @@ -85,7 +101,7 @@ " \n" "+#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define\tSO_SNDTIMEO SO_SNDTIMEO_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" "diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h\n" @@ -109,7 +125,7 @@ " \n" "+#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define\tSO_SNDTIMEO SO_SNDTIMEO_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" "diff --git a/arch/powerpc/include/uapi/asm/socket.h b/arch/powerpc/include/uapi/asm/socket.h\n" @@ -148,7 +164,7 @@ " \n" "+#define\tSO_RCVTIMEO\tSO_RCVTIMEO_OLD\n" "+#define\tSO_SNDTIMEO\tSO_SNDTIMEO_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" "diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c\n" @@ -169,7 +185,7 @@ "+\tkernel_setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO_OLD, (char *)&tv,\n" " \t\t\t sizeof(tv));\n" " \n" - " \tif (result == -EINPROGRESS)\n" + " \tif (result = -EINPROGRESS)\n" "diff --git a/include/net/sock.h b/include/net/sock.h\n" "index 6679f3c120b0..98965a9a2bf4 100644\n" "--- a/include/net/sock.h\n" @@ -206,7 +222,7 @@ " \n" "+#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define\tSO_SNDTIMEO SO_SNDTIMEO_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" "diff --git a/net/compat.c b/net/compat.c\n" @@ -217,8 +233,8 @@ " \t\treturn do_set_attach_filter(sock, level, optname,\n" " \t\t\t\t\t optval, optlen);\n" " \tif (!COMPAT_USE_64BIT_TIME &&\n" - "-\t (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO))\n" - "+\t (optname == SO_RCVTIMEO_OLD || optname == SO_SNDTIMEO_OLD))\n" + "-\t (optname = SO_RCVTIMEO || optname = SO_SNDTIMEO))\n" + "+\t (optname = SO_RCVTIMEO_OLD || optname = SO_SNDTIMEO_OLD))\n" " \t\treturn do_set_sock_timeout(sock, level, optname, optval, optlen);\n" " \n" " \treturn sock_setsockopt(sock, level, optname, optval, optlen);\n" @@ -226,8 +242,8 @@ " \t\t\t\tchar __user *optval, int __user *optlen)\n" " {\n" " \tif (!COMPAT_USE_64BIT_TIME &&\n" - "-\t (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO))\n" - "+\t (optname == SO_RCVTIMEO_OLD || optname == SO_SNDTIMEO_OLD))\n" + "-\t (optname = SO_RCVTIMEO || optname = SO_SNDTIMEO))\n" + "+\t (optname = SO_RCVTIMEO_OLD || optname = SO_SNDTIMEO_OLD))\n" " \t\treturn do_get_sock_timeout(sock, level, optname, optval, optlen);\n" " \treturn sock_getsockopt(sock, level, optname, optval, optlen);\n" " }\n" @@ -256,7 +272,7 @@ "-\tcase SO_RCVTIMEO:\n" "+\tcase SO_RCVTIMEO_OLD:\n" " \t\tlv = sizeof(struct __kernel_old_timeval);\n" - " \t\tif (sk->sk_rcvtimeo == MAX_SCHEDULE_TIMEOUT) {\n" + " \t\tif (sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT) {\n" " \t\t\tv.tm.tv_sec = 0;\n" "@@ -1233,7 +1233,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,\n" " \t\t}\n" @@ -265,9 +281,9 @@ "-\tcase SO_SNDTIMEO:\n" "+\tcase SO_SNDTIMEO_OLD:\n" " \t\tlv = sizeof(struct __kernel_old_timeval);\n" - " \t\tif (sk->sk_sndtimeo == MAX_SCHEDULE_TIMEOUT) {\n" + " \t\tif (sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT) {\n" " \t\t\tv.tm.tv_sec = 0;\n" "-- \n" 2.17.1 -e78b531297056e4b43b8d20406f6e03925b26459ad52460fc378870a7e319412 +a38616072a2322ac93e55f6dc7f9d69a5b3dced8b15d4e501c169250aae039ec
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.