diff for duplicates of <52D653B1.4040708@huawei.com> diff --git a/a/1.txt b/N1/1.txt index 4a36826..4e9fd56 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,55 +28,66 @@ index 7cc62b9..20dd417 100644 * 7.1.23. Get or set delayed ack timer (SCTP_DELAYED_SACK) * @@ -2610,37 +2620,31 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk, - asoc->sackdelay msecs_to_jiffies(params.sack_delay); - asoc->param_flags - (asoc->param_flags & ~SPP_SACKDELAY) | + asoc->sackdelay = + msecs_to_jiffies(params.sack_delay); + asoc->param_flags = +- (asoc->param_flags & ~SPP_SACKDELAY) | - SPP_SACKDELAY_ENABLE; + sctp_spp_sackdelay_enable(asoc->param_flags); } else { sp->sackdelay = params.sack_delay; - sp->param_flags - (sp->param_flags & ~SPP_SACKDELAY) | + sp->param_flags = +- (sp->param_flags & ~SPP_SACKDELAY) | - SPP_SACKDELAY_ENABLE; + sctp_spp_sackdelay_enable(sp->param_flags); } } - if (params.sack_freq = 1) { + if (params.sack_freq == 1) { if (asoc) { - asoc->param_flags - (asoc->param_flags & ~SPP_SACKDELAY) | + asoc->param_flags = +- (asoc->param_flags & ~SPP_SACKDELAY) | - SPP_SACKDELAY_DISABLE; + sctp_spp_sackdelay_disable(asoc->param_flags); } else { - sp->param_flags - (sp->param_flags & ~SPP_SACKDELAY) | + sp->param_flags = +- (sp->param_flags & ~SPP_SACKDELAY) | - SPP_SACKDELAY_DISABLE; + sctp_spp_sackdelay_disable(sp->param_flags); } } else if (params.sack_freq > 1) { if (asoc) { asoc->sackfreq = params.sack_freq; - asoc->param_flags - (asoc->param_flags & ~SPP_SACKDELAY) | + asoc->param_flags = +- (asoc->param_flags & ~SPP_SACKDELAY) | - SPP_SACKDELAY_ENABLE; + sctp_spp_sackdelay_enable(asoc->param_flags); } else { sp->sackfreq = params.sack_freq; - sp->param_flags - (sp->param_flags & ~SPP_SACKDELAY) | + sp->param_flags = +- (sp->param_flags & ~SPP_SACKDELAY) | - SPP_SACKDELAY_ENABLE; + sctp_spp_sackdelay_enable(sp->param_flags); } } @@ -2652,18 +2656,15 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk, - trans->sackdelay msecs_to_jiffies(params.sack_delay); - trans->param_flags - (trans->param_flags & ~SPP_SACKDELAY) | + trans->sackdelay = + msecs_to_jiffies(params.sack_delay); + trans->param_flags = +- (trans->param_flags & ~SPP_SACKDELAY) | - SPP_SACKDELAY_ENABLE; + sctp_spp_sackdelay_enable(trans->param_flags); } - if (params.sack_freq = 1) { - trans->param_flags - (trans->param_flags & ~SPP_SACKDELAY) | + if (params.sack_freq == 1) { + trans->param_flags = +- (trans->param_flags & ~SPP_SACKDELAY) | - SPP_SACKDELAY_DISABLE; + sctp_spp_sackdelay_disable(trans->param_flags); } else if (params.sack_freq > 1) { trans->sackfreq = params.sack_freq; - trans->param_flags - (trans->param_flags & ~SPP_SACKDELAY) | + trans->param_flags = +- (trans->param_flags & ~SPP_SACKDELAY) | - SPP_SACKDELAY_ENABLE; + sctp_spp_sackdelay_enable(trans->param_flags); } diff --git a/a/content_digest b/N1/content_digest index e835c23..c825627 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,11 @@ "From\0Wang Weidong <wangweidong1@huawei.com>\0" "Subject\0[PATCH net-next] sctp: create helper function to enable|disable sackdelay\0" - "Date\0Wed, 15 Jan 2014 09:24:01 +0000\0" + "Date\0Wed, 15 Jan 2014 17:24:01 +0800\0" "To\0Vlad Yasevich <vyasevich@gmail.com>" Neil Horman <nhorman@tuxdriver.com> " David Miller <davem@davemloft.net>\0" - "Cc\0linux-sctp@vger.kernel.org" - " netdev@vger.kernel.org\0" + "Cc\0<linux-sctp@vger.kernel.org>" + " <netdev@vger.kernel.org>\0" "\00:1\0" "b\0" "add sctp_spp_sackdelay_{enable|disable} helper function for\n" @@ -38,55 +38,66 @@ " * 7.1.23. Get or set delayed ack timer (SCTP_DELAYED_SACK)\n" " *\n" "@@ -2610,37 +2620,31 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk,\n" - " \t\t\tasoc->sackdelay \t\t\t\tmsecs_to_jiffies(params.sack_delay);\n" - " \t\t\tasoc->param_flags -\t\t\t\t(asoc->param_flags & ~SPP_SACKDELAY) |\n" + " \t\t\tasoc->sackdelay =\n" + " \t\t\t\tmsecs_to_jiffies(params.sack_delay);\n" + " \t\t\tasoc->param_flags =\n" + "-\t\t\t\t(asoc->param_flags & ~SPP_SACKDELAY) |\n" "-\t\t\t\tSPP_SACKDELAY_ENABLE;\n" "+\t\t\t\tsctp_spp_sackdelay_enable(asoc->param_flags);\n" " \t\t} else {\n" " \t\t\tsp->sackdelay = params.sack_delay;\n" - " \t\t\tsp->param_flags -\t\t\t\t(sp->param_flags & ~SPP_SACKDELAY) |\n" + " \t\t\tsp->param_flags =\n" + "-\t\t\t\t(sp->param_flags & ~SPP_SACKDELAY) |\n" "-\t\t\t\tSPP_SACKDELAY_ENABLE;\n" "+\t\t\t\tsctp_spp_sackdelay_enable(sp->param_flags);\n" " \t\t}\n" " \t}\n" " \n" - " \tif (params.sack_freq = 1) {\n" + " \tif (params.sack_freq == 1) {\n" " \t\tif (asoc) {\n" - " \t\t\tasoc->param_flags -\t\t\t\t(asoc->param_flags & ~SPP_SACKDELAY) |\n" + " \t\t\tasoc->param_flags =\n" + "-\t\t\t\t(asoc->param_flags & ~SPP_SACKDELAY) |\n" "-\t\t\t\tSPP_SACKDELAY_DISABLE;\n" "+\t\t\t\tsctp_spp_sackdelay_disable(asoc->param_flags);\n" " \t\t} else {\n" - " \t\t\tsp->param_flags -\t\t\t\t(sp->param_flags & ~SPP_SACKDELAY) |\n" + " \t\t\tsp->param_flags =\n" + "-\t\t\t\t(sp->param_flags & ~SPP_SACKDELAY) |\n" "-\t\t\t\tSPP_SACKDELAY_DISABLE;\n" "+\t\t\t\tsctp_spp_sackdelay_disable(sp->param_flags);\n" " \t\t}\n" " \t} else if (params.sack_freq > 1) {\n" " \t\tif (asoc) {\n" " \t\t\tasoc->sackfreq = params.sack_freq;\n" - " \t\t\tasoc->param_flags -\t\t\t\t(asoc->param_flags & ~SPP_SACKDELAY) |\n" + " \t\t\tasoc->param_flags =\n" + "-\t\t\t\t(asoc->param_flags & ~SPP_SACKDELAY) |\n" "-\t\t\t\tSPP_SACKDELAY_ENABLE;\n" "+\t\t\t\tsctp_spp_sackdelay_enable(asoc->param_flags);\n" " \t\t} else {\n" " \t\t\tsp->sackfreq = params.sack_freq;\n" - " \t\t\tsp->param_flags -\t\t\t\t(sp->param_flags & ~SPP_SACKDELAY) |\n" + " \t\t\tsp->param_flags =\n" + "-\t\t\t\t(sp->param_flags & ~SPP_SACKDELAY) |\n" "-\t\t\t\tSPP_SACKDELAY_ENABLE;\n" "+\t\t\t\tsctp_spp_sackdelay_enable(sp->param_flags);\n" " \t\t}\n" " \t}\n" " \n" "@@ -2652,18 +2656,15 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk,\n" - " \t\t\t\ttrans->sackdelay \t\t\t\t\tmsecs_to_jiffies(params.sack_delay);\n" - " \t\t\t\ttrans->param_flags -\t\t\t\t\t(trans->param_flags & ~SPP_SACKDELAY) |\n" + " \t\t\t\ttrans->sackdelay =\n" + " \t\t\t\t\tmsecs_to_jiffies(params.sack_delay);\n" + " \t\t\t\ttrans->param_flags =\n" + "-\t\t\t\t\t(trans->param_flags & ~SPP_SACKDELAY) |\n" "-\t\t\t\t\tSPP_SACKDELAY_ENABLE;\n" "+\t\t\t\t\tsctp_spp_sackdelay_enable(trans->param_flags);\n" " \t\t\t}\n" - " \t\t\tif (params.sack_freq = 1) {\n" - " \t\t\t\ttrans->param_flags -\t\t\t\t\t(trans->param_flags & ~SPP_SACKDELAY) |\n" + " \t\t\tif (params.sack_freq == 1) {\n" + " \t\t\t\ttrans->param_flags =\n" + "-\t\t\t\t\t(trans->param_flags & ~SPP_SACKDELAY) |\n" "-\t\t\t\t\tSPP_SACKDELAY_DISABLE;\n" "+\t\t\t\t\tsctp_spp_sackdelay_disable(trans->param_flags);\n" " \t\t\t} else if (params.sack_freq > 1) {\n" " \t\t\t\ttrans->sackfreq = params.sack_freq;\n" - " \t\t\t\ttrans->param_flags -\t\t\t\t\t(trans->param_flags & ~SPP_SACKDELAY) |\n" + " \t\t\t\ttrans->param_flags =\n" + "-\t\t\t\t\t(trans->param_flags & ~SPP_SACKDELAY) |\n" "-\t\t\t\t\tSPP_SACKDELAY_ENABLE;\n" "+\t\t\t\t\tsctp_spp_sackdelay_enable(trans->param_flags);\n" " \t\t\t}\n" @@ -95,4 +106,4 @@ "-- \n" 1.7.12 -8984849e59c7c147e7aaca8b210bcd9f21cffbe45c4958cfecf17373ec1ef19a +d1c94aa9d847f33492b1a0c1aa4e4b427b86e29b9aa49babbfc7d232954e8996
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.