diff for duplicates of <20171005005226.GA23598@beast> diff --git a/a/1.txt b/N1/1.txt index 61494af..3346694 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -51,7 +51,8 @@ index 3a2c34027758..1e35526bf436 100644 { - struct sock *sk = (struct sock *)data; - struct inet_connection_sock *icsk = inet_csk(sk); -+ struct inet_connection_sock *icsk + from_timer(icsk, t, icsk_retransmit_timer); ++ struct inet_connection_sock *icsk = ++ from_timer(icsk, t, icsk_retransmit_timer); + struct sock *sk = &icsk->icsk_inet.sk; int event = 0; @@ -76,7 +77,8 @@ index 3a2c34027758..1e35526bf436 100644 { - struct sock *sk = (struct sock *)data; - struct inet_connection_sock *icsk = inet_csk(sk); -+ struct inet_connection_sock *icsk + from_timer(icsk, t, icsk_delack_timer); ++ struct inet_connection_sock *icsk = ++ from_timer(icsk, t, icsk_delack_timer); + struct sock *sk = &icsk->icsk_inet.sk; bh_lock_sock(sk); @@ -121,7 +123,8 @@ index 655dd8d7f064..d24c29f73146 100644 +static void tcp_delack_timer(struct timer_list *t) { - struct sock *sk = (struct sock *)data; -+ struct inet_connection_sock *icsk + from_timer(icsk, t, icsk_delack_timer); ++ struct inet_connection_sock *icsk = ++ from_timer(icsk, t, icsk_delack_timer); + struct sock *sk = &icsk->icsk_inet.sk; bh_lock_sock(sk); @@ -141,7 +144,8 @@ index 655dd8d7f064..d24c29f73146 100644 +static void tcp_write_timer(struct timer_list *t) { - struct sock *sk = (struct sock *)data; -+ struct inet_connection_sock *icsk + from_timer(icsk, t, icsk_retransmit_timer); ++ struct inet_connection_sock *icsk = ++ from_timer(icsk, t, icsk_retransmit_timer); + struct sock *sk = &icsk->icsk_inet.sk; bh_lock_sock(sk); diff --git a/a/content_digest b/N1/content_digest index da4a8c1..426cb81 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,14 @@ "From\0Kees Cook <keescook@chromium.org>\0" "Subject\0[PATCH] inet/connection_sock: Convert timers to use\0" - "Date\0Thu, 05 Oct 2017 00:52:26 +0000\0" - "To\0dccp@vger.kernel.org\0" + "Date\0Wed, 4 Oct 2017 17:52:26 -0700\0" + "To\0linux-kernel@vger.kernel.org\0" + "Cc\0David S. Miller <davem@davemloft.net>" + Gerrit Renker <gerrit@erg.abdn.ac.uk> + Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> + Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> + netdev@vger.kernel.org + dccp@vger.kernel.org + " Thomas Gleixner <tglx@linutronix.de>\0" "\00:1\0" "b\0" "In preparation for unconditionally passing the struct timer_list pointer to\n" @@ -57,7 +64,8 @@ " {\n" "-\tstruct sock *sk = (struct sock *)data;\n" "-\tstruct inet_connection_sock *icsk = inet_csk(sk);\n" - "+\tstruct inet_connection_sock *icsk +\t\t\tfrom_timer(icsk, t, icsk_retransmit_timer);\n" + "+\tstruct inet_connection_sock *icsk =\n" + "+\t\t\tfrom_timer(icsk, t, icsk_retransmit_timer);\n" "+\tstruct sock *sk = &icsk->icsk_inet.sk;\n" " \tint event = 0;\n" " \n" @@ -82,7 +90,8 @@ " {\n" "-\tstruct sock *sk = (struct sock *)data;\n" "-\tstruct inet_connection_sock *icsk = inet_csk(sk);\n" - "+\tstruct inet_connection_sock *icsk +\t\t\tfrom_timer(icsk, t, icsk_delack_timer);\n" + "+\tstruct inet_connection_sock *icsk =\n" + "+\t\t\tfrom_timer(icsk, t, icsk_delack_timer);\n" "+\tstruct sock *sk = &icsk->icsk_inet.sk;\n" " \n" " \tbh_lock_sock(sk);\n" @@ -127,7 +136,8 @@ "+static void tcp_delack_timer(struct timer_list *t)\n" " {\n" "-\tstruct sock *sk = (struct sock *)data;\n" - "+\tstruct inet_connection_sock *icsk +\t\t\tfrom_timer(icsk, t, icsk_delack_timer);\n" + "+\tstruct inet_connection_sock *icsk =\n" + "+\t\t\tfrom_timer(icsk, t, icsk_delack_timer);\n" "+\tstruct sock *sk = &icsk->icsk_inet.sk;\n" " \n" " \tbh_lock_sock(sk);\n" @@ -147,7 +157,8 @@ "+static void tcp_write_timer(struct timer_list *t)\n" " {\n" "-\tstruct sock *sk = (struct sock *)data;\n" - "+\tstruct inet_connection_sock *icsk +\t\t\tfrom_timer(icsk, t, icsk_retransmit_timer);\n" + "+\tstruct inet_connection_sock *icsk =\n" + "+\t\t\tfrom_timer(icsk, t, icsk_retransmit_timer);\n" "+\tstruct sock *sk = &icsk->icsk_inet.sk;\n" " \n" " \tbh_lock_sock(sk);\n" @@ -172,4 +183,4 @@ "Kees Cook\n" Pixel Security -ebf079003dcff4d0028f82a4b9ae86074faa2d730e3cef631b7077924a0708c5 +a3d4892948732ef565daf8de7dd1f3bd02edaf23e4efa8a9aeaacf4423ebe8c3
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.