diff for duplicates of <20071203124412.GC15034@ghostprotocols.net> diff --git a/a/1.txt b/N1/1.txt index 1d79dc6..86dc17a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -60,7 +60,7 @@ Your original patch: + + for (i = 0; i <= NDUPACK; i++) { + h->ring[i] = kmem_cache_alloc(tfrc_rxh_cache, GFP_ATOMIC); -+ if (h->ring[i] = NULL) ++ if (h->ring[i] == NULL) + return 1; + } + h->loss_count = 0; @@ -134,7 +134,7 @@ working on the loss interval code. > // ... > u32 sample, payload_size = skb->len - dccp_hdr(skb)->dccph_doff * 4; > -> if (unlikely(hcrx->ccid3hcrx_state = TFRC_RSTATE_NO_DATA)) { +> if (unlikely(hcrx->ccid3hcrx_state == TFRC_RSTATE_NO_DATA)) { > if (is_data_packet) { > do_feedback = FBACK_INITIAL; > ccid3_hc_rx_set_state(sk, TFRC_RSTATE_DATA); @@ -143,7 +143,7 @@ working on the loss interval code. > goto update_records; > } > -> => Non-data packets are ignored for the purposes of computing s (this is in the RFC), +> ==> Non-data packets are ignored for the purposes of computing s (this is in the RFC), > consequently update_s() is only called for data packets; using the two following > functions: > @@ -177,7 +177,7 @@ calling ccid3_hc_rx_update_s, but just doing: also excessive, no? As we should pass just data packets, perhaps we should just do a BUG_ON there. > -> => Hence I can't see where a zero value should come from: ccid3hrx_s is initially +> ==> Hence I can't see where a zero value should come from: ccid3hrx_s is initially > initialised with zero (memset(...,0,...)); when first called, update_s() will > feed a non-zero payload size to tfrc_ewma(), which will return `newval' = payload_size, > hence the first data packet will contribute a non-zero payload_size. diff --git a/a/content_digest b/N1/content_digest index 3c2df36..823b4bc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,13 @@ "ref\01196631416-17778-1-git-send-email-acme@redhat.com\0" + "ref\020071203083512.GA5484@gerrit.erg.abdn.ac.uk\0" "From\0Arnaldo Carvalho de Melo <acme@redhat.com>\0" "Subject\0Re: [RFC][PATCHES 0/7]: Reorganization of RX history patches\0" - "Date\0Mon, 03 Dec 2007 12:44:12 +0000\0" - "To\0dccp@vger.kernel.org\0" + "Date\0Mon, 3 Dec 2007 10:44:12 -0200\0" + "To\0Gerrit Renker <gerrit@erg.abdn.ac.uk>" + Arnaldo Carvalho de Melo <acme@redhat.com> + netdev@vger.kernel.org + dccp@vger.kernel.org + " Ingo Molnar <mingo@elte.hu>\0" "\00:1\0" "b\0" "Em Mon, Dec 03, 2007 at 08:35:12AM +0000, Gerrit Renker escreveu:\n" @@ -67,7 +72,7 @@ "+\n" "+\tfor (i = 0; i <= NDUPACK; i++) {\n" "+\t\th->ring[i] = kmem_cache_alloc(tfrc_rxh_cache, GFP_ATOMIC);\n" - "+\t\tif (h->ring[i] = NULL)\n" + "+\t\tif (h->ring[i] == NULL)\n" "+\t\t\treturn 1;\n" "+\t}\n" "+\th->loss_count = 0;\n" @@ -141,7 +146,7 @@ "> \t\t// ...\n" "> \t\tu32 sample, payload_size = skb->len - dccp_hdr(skb)->dccph_doff * 4;\n" "> \n" - "> \t\tif (unlikely(hcrx->ccid3hcrx_state = TFRC_RSTATE_NO_DATA)) {\n" + "> \t\tif (unlikely(hcrx->ccid3hcrx_state == TFRC_RSTATE_NO_DATA)) {\n" "> \t\t\tif (is_data_packet) {\n" "> \t\t\t\tdo_feedback = FBACK_INITIAL;\n" "> \t\t\t\tccid3_hc_rx_set_state(sk, TFRC_RSTATE_DATA);\n" @@ -150,7 +155,7 @@ "> \t\t\tgoto update_records;\n" "> \t\t}\n" "> \n" - "> => Non-data packets are ignored for the purposes of computing s (this is in the RFC),\n" + "> ==> Non-data packets are ignored for the purposes of computing s (this is in the RFC),\n" "> consequently update_s() is only called for data packets; using the two following\n" "> functions:\n" "> \n" @@ -184,7 +189,7 @@ "also excessive, no? As we should pass just data packets, perhaps we should\n" "just do a BUG_ON there.\n" "> \n" - "> => Hence I can't see where a zero value should come from: ccid3hrx_s is initially \n" + "> ==> Hence I can't see where a zero value should come from: ccid3hrx_s is initially \n" "> initialised with zero (memset(...,0,...)); when first called, update_s() will\n" "> feed a non-zero payload size to tfrc_ewma(), which will return `newval' = payload_size,\n" "> hence the first data packet will contribute a non-zero payload_size.\n" @@ -236,4 +241,4 @@ "\n" - Arnaldo -d55a8ddd4a9f8f968b593d2788e1262728edff83013c08354c3ac0ebea6046eb +3bb389a35f2bccd490f6dcbdf7824be7e56cb03b928e5525c63f7006e0c7d3c0
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.