tree 9ee923abbafb48b5f3220b817c84ba206914ab1c
parent 74459dc7bacda04d14626d239c8f5c4dac22560d
author Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> Wed, 10 Aug 2005 10:16:04
-0700
committer David S. Miller <[EMAIL PROTECTED]> Tue, 30 Aug 2005 05:50:08 -0700
[CCID3]: Reenable list_for_each_entry_safe_continue usage
Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
net/dccp/ccids/ccid3.c | 10 +---------
1 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -1272,13 +1272,10 @@ static void ccid3_hc_tx_packet_recv(stru
ccid3_calc_new_delta(hctx);
/* remove all packets older than the one acked from history */
-#if 0
- FIXME!
list_for_each_entry_safe_continue(entry, next,
&hctx->ccid3hctx_hist, ccid3htx_node) {
list_del_init(&entry->ccid3htx_node);
ccid3_tx_hist_entry_delete(entry);
}
-#endif
if (hctx->ccid3hctx_x < 10) {
ccid3_pr_debug("ccid3_hc_tx_packet_recv
hctx->ccid3hctx_x < 10\n");
hctx->ccid3hctx_x = 10;
@@ -1820,8 +1817,7 @@ static void ccid3_hc_rx_detect_loss(stru
a_next = b_next;
num_later = 1;
-#if 0
- FIXME MERGE GIT!
+
list_for_each_entry_safe_continue(entry, a_next, &hcrx->ccid3hcrx_hist,
ccid3hrx_node) {
if (num_later == 0) {
a_loss = entry;
@@ -1830,7 +1826,6 @@ static void ccid3_hc_rx_detect_loss(stru
entry->ccid3hrx_type == DCCP_PKT_DATAACK)
--num_later;
}
-#endif
if (a_loss == NULL) {
if (list_empty(&hcrx->ccid3hcrx_loss_interval_hist)) {
@@ -1848,8 +1843,6 @@ static void ccid3_hc_rx_detect_loss(stru
/* Locate a lost data packet */
entry = packet = b_loss;
-#if 0
- FIXME MERGE GIT!
list_for_each_entry_safe_continue(entry, b_next, &hcrx->ccid3hcrx_hist,
ccid3hrx_node) {
u64 delta = dccp_delta_seqno(entry->ccid3hrx_seqno,
packet->ccid3hrx_seqno);
@@ -1875,7 +1868,6 @@ static void ccid3_hc_rx_detect_loss(stru
if (packet == a_loss)
break;
}
-#endif
if (seq_loss != DCCP_MAX_SEQNO + 1)
win_loss = a_loss->ccid3hrx_win_count;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
