diff for duplicates of <5303731C.8020308@gmail.com> diff --git a/a/1.txt b/N1/1.txt index d3a1dde..c1c4233 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,8 @@ On 02/18/2014 12:56 AM, Xufeng Zhang wrote: > +++ b/net/sctp/socket.c > @@ -2344,6 +2344,11 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params, > if (trans) { -> trans->hbinterval > msecs_to_jiffies(params->spp_hbinterval); +> trans->hbinterval = +> msecs_to_jiffies(params->spp_hbinterval); > + > + /* Update the heartbeat timer immediately. */ > + if (!mod_timer(&trans->hb_timer, @@ -50,5 +51,6 @@ outstanding at the same time. > } else if (asoc) { -> asoc->hbinterval > msecs_to_jiffies(params->spp_hbinterval); +> asoc->hbinterval = +> msecs_to_jiffies(params->spp_hbinterval); > diff --git a/a/content_digest b/N1/content_digest index ea28da1..95794ee 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01392703010-6128-1-git-send-email-xufeng.zhang@windriver.com\0" "From\0Vlad Yasevich <vyasevich@gmail.com>\0" "Subject\0Re: [PATCH RFC] sctp: Update HEARTBEAT timer immediately after user changed HB.interval\0" - "Date\0Tue, 18 Feb 2014 14:50:04 +0000\0" + "Date\0Tue, 18 Feb 2014 09:50:04 -0500\0" "To\0Xufeng Zhang <xufeng.zhang@windriver.com>" nhorman@tuxdriver.com " davem@davemloft.net\0" @@ -33,7 +33,8 @@ "> +++ b/net/sctp/socket.c\n" "> @@ -2344,6 +2344,11 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,\n" "> \t\t\tif (trans) {\n" - "> \t\t\t\ttrans->hbinterval > \t\t\t\t msecs_to_jiffies(params->spp_hbinterval);\n" + "> \t\t\t\ttrans->hbinterval =\n" + "> \t\t\t\t msecs_to_jiffies(params->spp_hbinterval);\n" "> +\n" "> +\t\t\t\t/* Update the heartbeat timer immediately. */\n" "> +\t\t\t\tif (!mod_timer(&trans->hb_timer,\n" @@ -62,7 +63,8 @@ "\n" "\n" "> \t\t\t} else if (asoc) {\n" - "> \t\t\t\tasoc->hbinterval > \t\t\t\t msecs_to_jiffies(params->spp_hbinterval);\n" + "> \t\t\t\tasoc->hbinterval =\n" + "> \t\t\t\t msecs_to_jiffies(params->spp_hbinterval);\n" > -556fbab624eaa2f003b5cb432c3ff18ef0d2eaaf47bc758b73fd28f45d9fb9a1 +ca5281830bfdb04f155d2e016d1eb388a739d9ca8de7a21ffef51cb259fb011b
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.