diff for duplicates of <20171227144320.c01ca1fcc00ec38ca7aa41e3@kernel.org> diff --git a/a/content_digest b/N1/content_digest index 0423fc6..7e56df5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,25 @@ + "ref\0151390830346.13277.15583398024850377955.stgit@devbox\0" "ref\0151390833345.13277.9194686808843116185.stgit@devbox\0" + "ref\020171226.185155.2132957966134649827.davem@davemloft.net\0" "From\0Masami Hiramatsu <mhiramat@kernel.org>\0" "Subject\0Re: [PATCH net-next v5 1/6] net: tcp: Add trace events for TCP congestion window tracing\0" "Date\0Wed, 27 Dec 2017 05:43:20 +0000\0" - "To\0dccp@vger.kernel.org\0" + "To\0David Miller <davem@davemloft.net>\0" + "Cc\0mingo@kernel.org" + ian.mcdonald@jandi.co.nz + vyasevich@gmail.com + stephen@networkplumber.org + rostedt@goodmis.org + peterz@infradead.org + tglx@linutronix.de + linux-kernel@vger.kernel.org + hpa@zytor.com + gerrit@erg.abdn.ac.uk + nhorman@tuxdriver.com + dccp@vger.kernel.org + netdev@vger.kernel.org + linux-sctp@vger.kernel.org + " sfr@canb.auug.org.au\0" "\00:1\0" "b\0" "On Tue, 26 Dec 2017 18:51:55 -0500 (EST)\n" @@ -257,4 +274,4 @@ "-- \n" Masami Hiramatsu <mhiramat@kernel.org> -5eaee2d0362eaeebc1bd71d7d81e9a5b682eec47cd044348c51ec949cc0e73ca +77309d6952ccff8897233b19be9db54d5c30d29819e83385b871e3829fa0ae03
diff --git a/a/1.txt b/N2/1.txt index 71946db..922c198 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -25,7 +25,7 @@ David Miller <davem@davemloft.net> wrote: > > + memset(__entry->saddr, 0, sizeof(struct sockaddr_in6)); > > + memset(__entry->daddr, 0, sizeof(struct sockaddr_in6)); > > + -> > + if (sk->sk_family = AF_INET) { +> > + if (sk->sk_family == AF_INET) { > > + struct sockaddr_in *v4 = (void *)__entry->saddr; > > + > > + v4->sin_family = AF_INET; @@ -36,7 +36,7 @@ David Miller <davem@davemloft.net> wrote: > > + v4->sin_port = inet->inet_dport; > > + v4->sin_addr.s_addr = inet->inet_daddr; > > +#if IS_ENABLED(CONFIG_IPV6) -> > + } else if (sk->sk_family = AF_INET6) { +> > + } else if (sk->sk_family == AF_INET6) { > > It looks like doing this ifdef test inside of a trace macro is very > undesirable because it upsets sparse. @@ -50,7 +50,7 @@ I'll update the series . Thank you, > -> ========== +> ==================== > commit 6a6b0b9914e73a8a54253dd5f6f5e5dd5e4a756c > Author: Mat Martineau <mathew.j.martineau@linux.intel.com> > Date: Thu Dec 21 10:29:09 2017 -0800 @@ -102,7 +102,7 @@ Thank you, > +#if IS_ENABLED(CONFIG_IPV6) > +#define TP_STORE_ADDRS(__entry, saddr, daddr, saddr6, daddr6) \ > + do { \ -> + if (sk->sk_family = AF_INET6) { \ +> + if (sk->sk_family == AF_INET6) { \ > + struct in6_addr *pin6; \ > + \ > + pin6 = (struct in6_addr *)__entry->saddr_v6; \ @@ -134,7 +134,7 @@ Thank you, > *p32 = inet->inet_daddr; > > -#if IS_ENABLED(CONFIG_IPV6) -> - if (sk->sk_family = AF_INET6) { +> - if (sk->sk_family == AF_INET6) { > - pin6 = (struct in6_addr *)__entry->saddr_v6; > - *pin6 = sk->sk_v6_rcv_saddr; > - pin6 = (struct in6_addr *)__entry->daddr_v6; @@ -165,7 +165,7 @@ Thank you, > *p32 = inet->inet_daddr; > > -#if IS_ENABLED(CONFIG_IPV6) -> - if (sk->sk_family = AF_INET6) { +> - if (sk->sk_family == AF_INET6) { > - pin6 = (struct in6_addr *)__entry->saddr_v6; > - *pin6 = sk->sk_v6_rcv_saddr; > - pin6 = (struct in6_addr *)__entry->daddr_v6; @@ -196,7 +196,7 @@ Thank you, > *p32 = inet->inet_daddr; > > -#if IS_ENABLED(CONFIG_IPV6) -> - if (sk->sk_family = AF_INET6) { +> - if (sk->sk_family == AF_INET6) { > - pin6 = (struct in6_addr *)__entry->saddr_v6; > - *pin6 = sk->sk_v6_rcv_saddr; > - pin6 = (struct in6_addr *)__entry->daddr_v6; @@ -227,7 +227,7 @@ Thank you, > *p32 = ireq->ir_rmt_addr; > > -#if IS_ENABLED(CONFIG_IPV6) -> - if (sk->sk_family = AF_INET6) { +> - if (sk->sk_family == AF_INET6) { > - pin6 = (struct in6_addr *)__entry->saddr_v6; > - *pin6 = ireq->ir_v6_loc_addr; > - pin6 = (struct in6_addr *)__entry->daddr_v6; diff --git a/a/content_digest b/N2/content_digest index 0423fc6..7095880 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,25 @@ + "ref\0151390830346.13277.15583398024850377955.stgit@devbox\0" "ref\0151390833345.13277.9194686808843116185.stgit@devbox\0" + "ref\020171226.185155.2132957966134649827.davem@davemloft.net\0" "From\0Masami Hiramatsu <mhiramat@kernel.org>\0" "Subject\0Re: [PATCH net-next v5 1/6] net: tcp: Add trace events for TCP congestion window tracing\0" - "Date\0Wed, 27 Dec 2017 05:43:20 +0000\0" - "To\0dccp@vger.kernel.org\0" + "Date\0Wed, 27 Dec 2017 14:43:20 +0900\0" + "To\0David Miller <davem@davemloft.net>\0" + "Cc\0mingo@kernel.org" + ian.mcdonald@jandi.co.nz + vyasevich@gmail.com + stephen@networkplumber.org + rostedt@goodmis.org + peterz@infradead.org + tglx@linutronix.de + linux-kernel@vger.kernel.org + hpa@zytor.com + gerrit@erg.abdn.ac.uk + nhorman@tuxdriver.com + dccp@vger.kernel.org + netdev@vger.kernel.org + linux-sctp@vger.kernel.org + " sfr@canb.auug.org.au\0" "\00:1\0" "b\0" "On Tue, 26 Dec 2017 18:51:55 -0500 (EST)\n" @@ -32,7 +49,7 @@ "> > +\t\tmemset(__entry->saddr, 0, sizeof(struct sockaddr_in6));\n" "> > +\t\tmemset(__entry->daddr, 0, sizeof(struct sockaddr_in6));\n" "> > +\n" - "> > +\t\tif (sk->sk_family = AF_INET) {\n" + "> > +\t\tif (sk->sk_family == AF_INET) {\n" "> > +\t\t\tstruct sockaddr_in *v4 = (void *)__entry->saddr;\n" "> > +\n" "> > +\t\t\tv4->sin_family = AF_INET;\n" @@ -43,7 +60,7 @@ "> > +\t\t\tv4->sin_port = inet->inet_dport;\n" "> > +\t\t\tv4->sin_addr.s_addr = inet->inet_daddr;\n" "> > +#if IS_ENABLED(CONFIG_IPV6)\n" - "> > +\t\t} else if (sk->sk_family = AF_INET6) {\n" + "> > +\t\t} else if (sk->sk_family == AF_INET6) {\n" "> \n" "> It looks like doing this ifdef test inside of a trace macro is very\n" "> undesirable because it upsets sparse.\n" @@ -57,7 +74,7 @@ "Thank you,\n" "\n" "> \n" - "> ==========\n" + "> ====================\n" "> commit 6a6b0b9914e73a8a54253dd5f6f5e5dd5e4a756c\n" "> Author: Mat Martineau <mathew.j.martineau@linux.intel.com>\n" "> Date: Thu Dec 21 10:29:09 2017 -0800\n" @@ -109,7 +126,7 @@ "> +#if IS_ENABLED(CONFIG_IPV6)\n" "> +#define TP_STORE_ADDRS(__entry, saddr, daddr, saddr6, daddr6)\t\t\\\n" "> +\tdo {\t\t\t\t\t\t\t\t\\\n" - "> +\t\tif (sk->sk_family = AF_INET6) {\t\t\t\\\n" + "> +\t\tif (sk->sk_family == AF_INET6) {\t\t\t\\\n" "> +\t\t\tstruct in6_addr *pin6;\t\t\t\t\\\n" "> +\t\t\t\t\t\t\t\t\t\\\n" "> +\t\t\tpin6 = (struct in6_addr *)__entry->saddr_v6;\t\\\n" @@ -141,7 +158,7 @@ "> \t\t*p32 = inet->inet_daddr;\n" "> \n" "> -#if IS_ENABLED(CONFIG_IPV6)\n" - "> -\t\tif (sk->sk_family = AF_INET6) {\n" + "> -\t\tif (sk->sk_family == AF_INET6) {\n" "> -\t\t\tpin6 = (struct in6_addr *)__entry->saddr_v6;\n" "> -\t\t\t*pin6 = sk->sk_v6_rcv_saddr;\n" "> -\t\t\tpin6 = (struct in6_addr *)__entry->daddr_v6;\n" @@ -172,7 +189,7 @@ "> \t\t*p32 = inet->inet_daddr;\n" "> \n" "> -#if IS_ENABLED(CONFIG_IPV6)\n" - "> -\t\tif (sk->sk_family = AF_INET6) {\n" + "> -\t\tif (sk->sk_family == AF_INET6) {\n" "> -\t\t\tpin6 = (struct in6_addr *)__entry->saddr_v6;\n" "> -\t\t\t*pin6 = sk->sk_v6_rcv_saddr;\n" "> -\t\t\tpin6 = (struct in6_addr *)__entry->daddr_v6;\n" @@ -203,7 +220,7 @@ "> \t\t*p32 = inet->inet_daddr;\n" "> \n" "> -#if IS_ENABLED(CONFIG_IPV6)\n" - "> -\t\tif (sk->sk_family = AF_INET6) {\n" + "> -\t\tif (sk->sk_family == AF_INET6) {\n" "> -\t\t\tpin6 = (struct in6_addr *)__entry->saddr_v6;\n" "> -\t\t\t*pin6 = sk->sk_v6_rcv_saddr;\n" "> -\t\t\tpin6 = (struct in6_addr *)__entry->daddr_v6;\n" @@ -234,7 +251,7 @@ "> \t\t*p32 = ireq->ir_rmt_addr;\n" "> \n" "> -#if IS_ENABLED(CONFIG_IPV6)\n" - "> -\t\tif (sk->sk_family = AF_INET6) {\n" + "> -\t\tif (sk->sk_family == AF_INET6) {\n" "> -\t\t\tpin6 = (struct in6_addr *)__entry->saddr_v6;\n" "> -\t\t\t*pin6 = ireq->ir_v6_loc_addr;\n" "> -\t\t\tpin6 = (struct in6_addr *)__entry->daddr_v6;\n" @@ -257,4 +274,4 @@ "-- \n" Masami Hiramatsu <mhiramat@kernel.org> -5eaee2d0362eaeebc1bd71d7d81e9a5b682eec47cd044348c51ec949cc0e73ca +46244e2a9200ec631dcfb109a791d75df7eb169c7aae37c995f8c175ff704697
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.