diff for duplicates of <5013069F.3080306@gmail.com> diff --git a/a/1.txt b/N1/1.txt index b0b84ea..8054304 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -72,7 +72,7 @@ index 891f5db..57532e3 100644 sctp_add_cmd_sf(commands, SCTP_CMD_GEN_SACK, force); + /* Queue the INVALID STREAM error after the SACK if one is needed. */ -+ if (SCTP_IERROR_BAD_STREAM = error) { ++ if (SCTP_IERROR_BAD_STREAM == error) { + sctp_add_cmd_sf(commands, SCTP_CMD_GEN_BAD_STREAM, + SCTP_PTR(chunk->subh.data_hdr)); + } @@ -85,7 +85,7 @@ sctp_sf_eat_data_fast_4_4(const struct sctp_endpoint *ep, */ sctp_add_cmd_sf(commands, SCTP_CMD_GEN_SHUTDOWN, SCTP_NULL()); sctp_add_cmd_sf(commands, SCTP_CMD_GEN_SACK, SCTP_FORCE()); -+ if (SCTP_IERROR_BAD_STREAM = error) { ++ if (SCTP_IERROR_BAD_STREAM == error) { + sctp_add_cmd_sf(commands, SCTP_CMD_GEN_BAD_STREAM, + SCTP_PTR(chunk->subh.data_hdr)); + } diff --git a/a/content_digest b/N1/content_digest index 87b353c..9775d24 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -14,7 +14,7 @@ "ref\0CA+=dFzguqjjnnqHO53Mx859VB6NU=4MaPWAUzGQB2qtZGfdAUg@mail.gmail.com\0" "From\0Vlad Yasevich <vyasevich@gmail.com>\0" "Subject\0Re: [PATCH] sctp: Make \"Invalid Stream Identifier\" ERROR follows SACK when bundling\0" - "Date\0Fri, 27 Jul 2012 21:22:39 +0000\0" + "Date\0Fri, 27 Jul 2012 17:22:39 -0400\0" "To\0Xufeng Zhang <xufengzhang.main@gmail.com>\0" "Cc\0Neil Horman <nhorman@tuxdriver.com>" xufeng zhang <xufeng.zhang@windriver.com> @@ -99,7 +99,7 @@ " \t\tsctp_add_cmd_sf(commands, SCTP_CMD_GEN_SACK, force);\n" "\n" "+\t/* Queue the INVALID STREAM error after the SACK if one is needed. */\n" - "+\tif (SCTP_IERROR_BAD_STREAM = error) {\n" + "+\tif (SCTP_IERROR_BAD_STREAM == error) {\n" "+\t\tsctp_add_cmd_sf(commands, SCTP_CMD_GEN_BAD_STREAM,\n" "+\t\t\t\tSCTP_PTR(chunk->subh.data_hdr));\n" "+\t}\n" @@ -112,7 +112,7 @@ " \t\t */\n" " \t\tsctp_add_cmd_sf(commands, SCTP_CMD_GEN_SHUTDOWN, SCTP_NULL());\n" " \t\tsctp_add_cmd_sf(commands, SCTP_CMD_GEN_SACK, SCTP_FORCE());\n" - "+\t\tif (SCTP_IERROR_BAD_STREAM = error) {\n" + "+\t\tif (SCTP_IERROR_BAD_STREAM == error) {\n" "+\t\t\tsctp_add_cmd_sf(commands, SCTP_CMD_GEN_BAD_STREAM,\n" "+\t\t\t\t\tSCTP_PTR(chunk->subh.data_hdr));\n" "+\t\t}\n" @@ -137,4 +137,4 @@ "\n" -- 1.7.7.6 -70a6835a085896e3cff0a5c9ae0c1b447f23a9280e02fcc13adc67b45fff2154 +43f5d7af36465e0a4b4b240c0487d96508e13e52bd4045c673b6b662f3efdde7
diff --git a/a/1.txt b/N2/1.txt index b0b84ea..8054304 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -72,7 +72,7 @@ index 891f5db..57532e3 100644 sctp_add_cmd_sf(commands, SCTP_CMD_GEN_SACK, force); + /* Queue the INVALID STREAM error after the SACK if one is needed. */ -+ if (SCTP_IERROR_BAD_STREAM = error) { ++ if (SCTP_IERROR_BAD_STREAM == error) { + sctp_add_cmd_sf(commands, SCTP_CMD_GEN_BAD_STREAM, + SCTP_PTR(chunk->subh.data_hdr)); + } @@ -85,7 +85,7 @@ sctp_sf_eat_data_fast_4_4(const struct sctp_endpoint *ep, */ sctp_add_cmd_sf(commands, SCTP_CMD_GEN_SHUTDOWN, SCTP_NULL()); sctp_add_cmd_sf(commands, SCTP_CMD_GEN_SACK, SCTP_FORCE()); -+ if (SCTP_IERROR_BAD_STREAM = error) { ++ if (SCTP_IERROR_BAD_STREAM == error) { + sctp_add_cmd_sf(commands, SCTP_CMD_GEN_BAD_STREAM, + SCTP_PTR(chunk->subh.data_hdr)); + } diff --git a/a/content_digest b/N2/content_digest index 87b353c..a719f69 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -11,10 +11,11 @@ "ref\0CA+=dFzj11c9K0TS0T7D1aBVz+ppdFK91ZzBbevLV23FrWJNzmw@mail.gmail.com\0" "ref\0CA+=dFziK09TVcK29x1SLg+JanOj6o__bJKf8yohw6dTYCUCF5A@mail.gmail.com\0" "ref\08ea83e51-81d1-407a-be06-98d2c99c876d@email.android.com\0" + "ref\0CA+=dFzguqjjnnqHO53Mx859VB6NU=4MaPWAUzGQB2qtZGfdAUg@mail .gmail.com\0" "ref\0CA+=dFzguqjjnnqHO53Mx859VB6NU=4MaPWAUzGQB2qtZGfdAUg@mail.gmail.com\0" "From\0Vlad Yasevich <vyasevich@gmail.com>\0" "Subject\0Re: [PATCH] sctp: Make \"Invalid Stream Identifier\" ERROR follows SACK when bundling\0" - "Date\0Fri, 27 Jul 2012 21:22:39 +0000\0" + "Date\0Fri, 27 Jul 2012 17:22:39 -0400\0" "To\0Xufeng Zhang <xufengzhang.main@gmail.com>\0" "Cc\0Neil Horman <nhorman@tuxdriver.com>" xufeng zhang <xufeng.zhang@windriver.com> @@ -99,7 +100,7 @@ " \t\tsctp_add_cmd_sf(commands, SCTP_CMD_GEN_SACK, force);\n" "\n" "+\t/* Queue the INVALID STREAM error after the SACK if one is needed. */\n" - "+\tif (SCTP_IERROR_BAD_STREAM = error) {\n" + "+\tif (SCTP_IERROR_BAD_STREAM == error) {\n" "+\t\tsctp_add_cmd_sf(commands, SCTP_CMD_GEN_BAD_STREAM,\n" "+\t\t\t\tSCTP_PTR(chunk->subh.data_hdr));\n" "+\t}\n" @@ -112,7 +113,7 @@ " \t\t */\n" " \t\tsctp_add_cmd_sf(commands, SCTP_CMD_GEN_SHUTDOWN, SCTP_NULL());\n" " \t\tsctp_add_cmd_sf(commands, SCTP_CMD_GEN_SACK, SCTP_FORCE());\n" - "+\t\tif (SCTP_IERROR_BAD_STREAM = error) {\n" + "+\t\tif (SCTP_IERROR_BAD_STREAM == error) {\n" "+\t\t\tsctp_add_cmd_sf(commands, SCTP_CMD_GEN_BAD_STREAM,\n" "+\t\t\t\t\tSCTP_PTR(chunk->subh.data_hdr));\n" "+\t\t}\n" @@ -137,4 +138,4 @@ "\n" -- 1.7.7.6 -70a6835a085896e3cff0a5c9ae0c1b447f23a9280e02fcc13adc67b45fff2154 +34c5711a4e5d1aa25ef340af0a00411fdf64f2484364631c5b2100a36e64f14f
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.