diff for duplicates of <20180720121418.764398602@linuxfoundation.org> diff --git a/a/1.txt b/N1/1.txt index 0f8f331..62e67ed 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + s64 delta; u64 fval; - if (hc->rx_rtt = 0) { + if (hc->rx_rtt == 0) { @@ -686,7 +687,9 @@ static u32 ccid3_first_li(struct sock *s hc->rx_rtt = DCCP_FALLBACK_RTT; } @@ -60,5 +60,5 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + if (delta <= 0) + delta = 1; x_recv = scaled_div32(hc->rx_bytes_recv, delta); - if (x_recv = 0) { /* would also trigger divide-by-zero */ - DCCP_WARN("X_recv=0\n"); + if (x_recv == 0) { /* would also trigger divide-by-zero */ + DCCP_WARN("X_recv==0\n"); diff --git a/a/content_digest b/N1/content_digest index 6ea0628..75d007f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,14 @@ + "ref\020180720121417.206337808@linuxfoundation.org\0" "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "Subject\0[PATCH 4.14 22/92] net: dccp: switch rx_tstamp_last_feedback to monotonic clock\0" - "Date\0Fri, 20 Jul 2018 12:13:26 +0000\0" - "To\0dccp@vger.kernel.org\0" + "Date\0Fri, 20 Jul 2018 14:13:26 +0200\0" + "To\0linux-kernel@vger.kernel.org\0" + "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" + stable@vger.kernel.org + Eric Dumazet <edumazet@google.com> + Gerrit Renker <gerrit@erg.abdn.ac.uk> + dccp@vger.kernel.org + " David S. Miller <davem@davemloft.net>\0" "\00:1\0" "b\0" "4.14-stable review patch. If anyone has any objections, please let me know.\n" @@ -56,7 +63,7 @@ "+\ts64 delta;\n" " \tu64 fval;\n" " \n" - " \tif (hc->rx_rtt = 0) {\n" + " \tif (hc->rx_rtt == 0) {\n" "@@ -686,7 +687,9 @@ static u32 ccid3_first_li(struct sock *s\n" " \t\thc->rx_rtt = DCCP_FALLBACK_RTT;\n" " \t}\n" @@ -66,7 +73,7 @@ "+\tif (delta <= 0)\n" "+\t\tdelta = 1;\n" " \tx_recv = scaled_div32(hc->rx_bytes_recv, delta);\n" - " \tif (x_recv = 0) {\t\t/* would also trigger divide-by-zero */\n" - " \t\tDCCP_WARN(\"X_recv=0\\n\");" + " \tif (x_recv == 0) {\t\t/* would also trigger divide-by-zero */\n" + " \t\tDCCP_WARN(\"X_recv==0\\n\");" -890bd3d5e2126c8884dcdbd55a86a0cdb960c088d4615a0524ea29064d96d7ac +f5ddf8f1fd1977185e8e98aa66fd94302f4dd11be8443d77c8390d1ad59c3643
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.