diff for duplicates of <20071205141027.GD4653@ghostprotocols.net> diff --git a/a/1.txt b/N1/1.txt index 59e1939..d6cffe2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,8 +15,9 @@ original patch, with this changes: 1. no need to calculate the payload size for non data packets as this value won't be used. 2. Initialize hcrx->ccid3hcrx_bytes_recv with the payload size when - hcrx->ccid3hcrx_state = TFRC_RSTATE_NO_DATA. -3. tfrc_rx_hist_duplicate() is only called when ccid3hcrx_state ! TFRC_RSTATE_NO_DATA, so it doesn't need to goto the done_receiving + hcrx->ccid3hcrx_state == TFRC_RSTATE_NO_DATA. +3. tfrc_rx_hist_duplicate() is only called when ccid3hcrx_state != + TFRC_RSTATE_NO_DATA, so it doesn't need to goto the done_receiving label (that was removed as this was its only use) as do_feedback would always be CCID3_FBACK_NONE and so the test would always fail and no feedback would be sent, so just return right there. @@ -30,12 +31,13 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb) const u32 ndp = dccp_sk(sk)->dccps_options_received.dccpor_ndp; const bool is_data_packet = dccp_data_packet(skb); - if (unlikely(hcrx->ccid3hcrx_state = TFRC_RSTATE_NO_DATA)) { + if (unlikely(hcrx->ccid3hcrx_state == TFRC_RSTATE_NO_DATA)) { if (is_data_packet) { const u32 payload = skb->len - dccp_hdr(skb)->dccph_doff * 4; do_feedback = FBACK_INITIAL; ccid3_hc_rx_set_state(sk, TFRC_RSTATE_DATA); - hcrx->ccid3hcrx_s hcrx->ccid3hcrx_bytes_recv = payload_size; + hcrx->ccid3hcrx_s = + hcrx->ccid3hcrx_bytes_recv = payload_size; } goto update_records; } @@ -135,7 +137,7 @@ int tfrc_rx_hist_duplicate(struct tfrc_rx_hist *h, struct sk_buff *skb) return 1; for (i = 1; i <= h->loss_count; i++) - if (tfrc_rx_hist_entry(h, i)->tfrchrx_seqno = seq) + if (tfrc_rx_hist_entry(h, i)->tfrchrx_seqno == seq) return 1; return 0; diff --git a/a/content_digest b/N1/content_digest index bce346a..3ef1897 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,13 @@ "ref\011968535863312-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\011968535864083-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\011968535861091-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\011968535861367-git-send-email-gerrit@erg.abdn.ac.uk\0" "From\0Arnaldo Carvalho de Melo <acme@redhat.com>\0" "Subject\0Re: [PATCH v2 0/3][BUG-FIX]: Test tree updates and bug fixes\0" - "Date\0Wed, 05 Dec 2007 14:10:27 +0000\0" - "To\0dccp@vger.kernel.org\0" + "Date\0Wed, 5 Dec 2007 12:10:27 -0200\0" + "To\0Gerrit Renker <gerrit@erg.abdn.ac.uk>\0" + "Cc\0dccp@vger.kernel.org" + " netdev@vger.kernel.org\0" "\00:1\0" "b\0" "Em Wed, Dec 05, 2007 at 11:19:46AM +0000, Gerrit Renker escreveu:\n" @@ -22,8 +27,9 @@ "1. no need to calculate the payload size for non data packets as this\n" " value won't be used.\n" "2. Initialize hcrx->ccid3hcrx_bytes_recv with the payload size when\n" - " hcrx->ccid3hcrx_state = TFRC_RSTATE_NO_DATA.\n" - "3. tfrc_rx_hist_duplicate() is only called when ccid3hcrx_state ! TFRC_RSTATE_NO_DATA, so it doesn't need to goto the done_receiving\n" + " hcrx->ccid3hcrx_state == TFRC_RSTATE_NO_DATA.\n" + "3. tfrc_rx_hist_duplicate() is only called when ccid3hcrx_state !=\n" + " TFRC_RSTATE_NO_DATA, so it doesn't need to goto the done_receiving\n" " label (that was removed as this was its only use) as do_feedback\n" " would always be CCID3_FBACK_NONE and so the test would always fail\n" " and no feedback would be sent, so just return right there.\n" @@ -37,12 +43,13 @@ "\tconst u32 ndp = dccp_sk(sk)->dccps_options_received.dccpor_ndp;\n" "\tconst bool is_data_packet = dccp_data_packet(skb);\n" "\n" - "\tif (unlikely(hcrx->ccid3hcrx_state = TFRC_RSTATE_NO_DATA)) {\n" + "\tif (unlikely(hcrx->ccid3hcrx_state == TFRC_RSTATE_NO_DATA)) {\n" "\t\tif (is_data_packet) {\n" "\t\t\tconst u32 payload = skb->len - dccp_hdr(skb)->dccph_doff * 4;\n" "\t\t\tdo_feedback = FBACK_INITIAL;\n" "\t\t\tccid3_hc_rx_set_state(sk, TFRC_RSTATE_DATA);\n" - "\t\t\thcrx->ccid3hcrx_s \t\t\t\thcrx->ccid3hcrx_bytes_recv = payload_size;\n" + "\t\t\thcrx->ccid3hcrx_s =\n" + "\t\t\t\thcrx->ccid3hcrx_bytes_recv = payload_size;\n" "\t\t}\n" "\t\tgoto update_records;\n" " \t}\n" @@ -142,7 +149,7 @@ "\t\treturn 1;\n" "\n" "\tfor (i = 1; i <= h->loss_count; i++)\n" - "\t\tif (tfrc_rx_hist_entry(h, i)->tfrchrx_seqno = seq)\n" + "\t\tif (tfrc_rx_hist_entry(h, i)->tfrchrx_seqno == seq)\n" "\t\t\treturn 1;\n" "\n" "\treturn 0;\n" @@ -159,4 +166,4 @@ "\n" - Arnaldo -b41c22910ce91c30f0ad2868a864e8b0007063e05336b4f7769d57a55b1f4005 +be9c8a5a2ce55278cd03a1050c557465ab63d171c6502c704ade4223d9526c99
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.