* [PATCHES 0/3]: DCCP patches for 2.6.25 @ 2007-12-08 18:52 Arnaldo Carvalho de Melo 2007-12-08 18:52 ` [PATCH 1/3] [TFRC]: Whitespace cleanups Arnaldo Carvalho de Melo 2007-12-09 8:32 ` [PATCHES 0/3]: DCCP patches for 2.6.25 David Miller 0 siblings, 2 replies; 5+ messages in thread From: Arnaldo Carvalho de Melo @ 2007-12-08 18:52 UTC (permalink / raw) To: David S. Miller; +Cc: netdev, dccp Hi David, Please consider pulling from: master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.25 Best Regards, - Arnaldo b/net/dccp/ccids/ccid3.c | 16 ++++++++-------- b/net/dccp/ccids/lib/loss_interval.c | 2 +- b/net/dccp/ccids/lib/packet_history.c | 13 ++++++------- net/dccp/ccids/ccid3.c | 4 +--- net/dccp/ccids/lib/packet_history.c | 6 ------ 5 files changed, 16 insertions(+), 25 deletions(-) ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] [TFRC]: Whitespace cleanups 2007-12-08 18:52 [PATCHES 0/3]: DCCP patches for 2.6.25 Arnaldo Carvalho de Melo @ 2007-12-08 18:52 ` Arnaldo Carvalho de Melo 2007-12-08 18:52 ` [PATCH 2/3] [TFRC]: The function tfrc_rx_hist_entry_delete() is not used anymore Arnaldo Carvalho de Melo 2007-12-09 8:32 ` [PATCHES 0/3]: DCCP patches for 2.6.25 David Miller 1 sibling, 1 reply; 5+ messages in thread From: Arnaldo Carvalho de Melo @ 2007-12-08 18:52 UTC (permalink / raw) To: David S. Miller; +Cc: netdev, dccp, Gerrit Renker, Arnaldo Carvalho de Melo From: Gerrit Renker <gerrit@erg.abdn.ac.uk> Just some tidy-ups to keep git/quilt happy. Also moved up the comment "Receiver routines" above the first occurrence of RX history routines. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- net/dccp/ccids/ccid3.c | 16 ++++++++-------- net/dccp/ccids/lib/loss_interval.c | 2 +- net/dccp/ccids/lib/packet_history.c | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index faacffa..a5246f7 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c @@ -780,7 +780,7 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb) */ } goto update_records; - } + } if (tfrc_rx_hist_duplicate(&hcrx->ccid3hcrx_hist, skb)) return; /* done receiving */ @@ -792,7 +792,7 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb) */ hcrx->ccid3hcrx_s = tfrc_ewma(hcrx->ccid3hcrx_s, payload, 9); hcrx->ccid3hcrx_bytes_recv += payload; - } + } /* * Handle pending losses and otherwise check for new loss @@ -808,11 +808,11 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb) if (list_empty(&hcrx->ccid3hcrx_li_hist)) { /* no loss so far: p = 0 */ const u32 sample = tfrc_rx_hist_sample_rtt(&hcrx->ccid3hcrx_hist, skb); - /* - * Empty loss history: no loss so far, hence p stays 0. - * Sample RTT values, since an RTT estimate is required for the - * computation of p when the first loss occurs; RFC 3448, 6.3.1. - */ + /* + * Empty loss history: no loss so far, hence p stays 0. + * Sample RTT values, since an RTT estimate is required for the + * computation of p when the first loss occurs; RFC 3448, 6.3.1. + */ if (sample != 0) hcrx->ccid3hcrx_rtt = tfrc_ewma(hcrx->ccid3hcrx_rtt, sample, 9); } @@ -823,7 +823,7 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb) if (SUB16(dccp_hdr(skb)->dccph_ccval, hcrx->ccid3hcrx_last_counter) > 3) do_feedback = CCID3_FBACK_PERIODIC; -update_records: +update_records: tfrc_rx_hist_add_packet(&hcrx->ccid3hcrx_hist, skb, ndp); if (do_feedback) diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c index 7e0714a..c0a933a 100644 --- a/net/dccp/ccids/lib/loss_interval.c +++ b/net/dccp/ccids/lib/loss_interval.c @@ -131,7 +131,7 @@ static u32 dccp_li_calc_first_li(struct sock *sk, { /* * FIXME: - * Will be rewritten in the upcoming new loss intervals code. + * Will be rewritten in the upcoming new loss intervals code. * Has to be commented ou because it relies on the old rx history * data structures */ diff --git a/net/dccp/ccids/lib/packet_history.c b/net/dccp/ccids/lib/packet_history.c index e197389..54cd23e 100644 --- a/net/dccp/ccids/lib/packet_history.c +++ b/net/dccp/ccids/lib/packet_history.c @@ -114,6 +114,11 @@ u32 tfrc_tx_hist_rtt(struct tfrc_tx_hist_entry *head, const u64 seqno, EXPORT_SYMBOL_GPL(tfrc_tx_hist_rtt); +/* + * Receiver History Routines + */ +static struct kmem_cache *tfrc_rx_hist_slab; + /** * tfrc_rx_hist_index - index to reach n-th entry after loss_start */ @@ -131,11 +136,6 @@ static inline struct tfrc_rx_hist_entry * return h->ring[tfrc_rx_hist_index(h, h->loss_count)]; } -/* - * Receiver History Routines - */ -static struct kmem_cache *tfrc_rx_hist_slab; - void tfrc_rx_hist_add_packet(struct tfrc_rx_hist *h, const struct sk_buff *skb, const u32 ndp) @@ -278,7 +278,7 @@ u32 tfrc_rx_hist_sample_rtt(struct tfrc_rx_hist *h, const struct sk_buff *skb) { u32 sample = 0, delta_v = SUB16(dccp_hdr(skb)->dccph_ccval, - tfrc_rx_hist_rtt_last_s(h)->tfrchrx_ccval); + tfrc_rx_hist_rtt_last_s(h)->tfrchrx_ccval); if (delta_v < 1 || delta_v > 4) { /* unsuitable CCVal delta */ if (h->rtt_sample_prev == 2) { /* previous candidate stored */ -- 1.5.3.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] [TFRC]: The function tfrc_rx_hist_entry_delete() is not used anymore 2007-12-08 18:52 ` [PATCH 1/3] [TFRC]: Whitespace cleanups Arnaldo Carvalho de Melo @ 2007-12-08 18:52 ` Arnaldo Carvalho de Melo 2007-12-08 18:52 ` [PATCH 3/3] [CCID3]: HC-receiver should not insert timestamps as HC-sender doesn't uses it Arnaldo Carvalho de Melo 0 siblings, 1 reply; 5+ messages in thread From: Arnaldo Carvalho de Melo @ 2007-12-08 18:52 UTC (permalink / raw) To: David S. Miller; +Cc: netdev, dccp, Gerrit Renker, Arnaldo Carvalho de Melo From: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- net/dccp/ccids/lib/packet_history.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/net/dccp/ccids/lib/packet_history.c b/net/dccp/ccids/lib/packet_history.c index 54cd23e..af44082 100644 --- a/net/dccp/ccids/lib/packet_history.c +++ b/net/dccp/ccids/lib/packet_history.c @@ -151,11 +151,6 @@ void tfrc_rx_hist_add_packet(struct tfrc_rx_hist *h, } EXPORT_SYMBOL_GPL(tfrc_rx_hist_add_packet); -static inline void tfrc_rx_hist_entry_delete(struct tfrc_rx_hist_entry *entry) -{ - kmem_cache_free(tfrc_rx_hist_slab, entry); -} - /** * tfrc_rx_hist_entry - return the n-th history entry after loss_start */ -- 1.5.3.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] [CCID3]: HC-receiver should not insert timestamps as HC-sender doesn't uses it 2007-12-08 18:52 ` [PATCH 2/3] [TFRC]: The function tfrc_rx_hist_entry_delete() is not used anymore Arnaldo Carvalho de Melo @ 2007-12-08 18:52 ` Arnaldo Carvalho de Melo 0 siblings, 0 replies; 5+ messages in thread From: Arnaldo Carvalho de Melo @ 2007-12-08 18:52 UTC (permalink / raw) To: David S. Miller; +Cc: netdev, dccp, Gerrit Renker, Arnaldo Carvalho de Melo From: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- net/dccp/ccids/ccid3.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index a5246f7..60fcb31 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c @@ -750,8 +750,7 @@ static int ccid3_hc_rx_insert_options(struct sock *sk, struct sk_buff *skb) x_recv = htonl(hcrx->ccid3hcrx_x_recv); pinv = htonl(hcrx->ccid3hcrx_pinv); - if (dccp_insert_option_timestamp(sk, skb) || - dccp_insert_option(sk, skb, TFRC_OPT_LOSS_EVENT_RATE, + if (dccp_insert_option(sk, skb, TFRC_OPT_LOSS_EVENT_RATE, &pinv, sizeof(pinv)) || dccp_insert_option(sk, skb, TFRC_OPT_RECEIVE_RATE, &x_recv, sizeof(x_recv))) -- 1.5.3.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCHES 0/3]: DCCP patches for 2.6.25 2007-12-08 18:52 [PATCHES 0/3]: DCCP patches for 2.6.25 Arnaldo Carvalho de Melo 2007-12-08 18:52 ` [PATCH 1/3] [TFRC]: Whitespace cleanups Arnaldo Carvalho de Melo @ 2007-12-09 8:32 ` David Miller 1 sibling, 0 replies; 5+ messages in thread From: David Miller @ 2007-12-09 8:32 UTC (permalink / raw) To: acme; +Cc: netdev, dccp From: Arnaldo Carvalho de Melo <acme@redhat.com> Date: Sat, 8 Dec 2007 16:52:10 -0200 > Hi David, > > Please consider pulling from: > > master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.25 Pulled, thanks a lot. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-12-09 8:32 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2007-12-08 18:52 [PATCHES 0/3]: DCCP patches for 2.6.25 Arnaldo Carvalho de Melo 2007-12-08 18:52 ` [PATCH 1/3] [TFRC]: Whitespace cleanups Arnaldo Carvalho de Melo 2007-12-08 18:52 ` [PATCH 2/3] [TFRC]: The function tfrc_rx_hist_entry_delete() is not used anymore Arnaldo Carvalho de Melo 2007-12-08 18:52 ` [PATCH 3/3] [CCID3]: HC-receiver should not insert timestamps as HC-sender doesn't uses it Arnaldo Carvalho de Melo 2007-12-09 8:32 ` [PATCHES 0/3]: DCCP patches for 2.6.25 David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).