aboutsummaryrefslogtreecommitdiff
path: root/net/dccp
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@ghostprotocols.net>2005-08-09 20:16:04 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 15:50:08 -0700
commit757f612e091e7d13707eedc3ff71f1a9b53f5537 (patch)
tree9ee923abbafb48b5f3220b817c84ba206914ab1c /net/dccp
parent74459dc7bacda04d14626d239c8f5c4dac22560d (diff)
[CCID3]: Reenable list_for_each_entry_safe_continue usage
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/ccids/ccid3.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 4f45902cb55..04299c7565f 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -1272,13 +1272,10 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
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(struct sock *sk)
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(struct sock *sk)
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(struct sock *sk)
/* 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(struct sock *sk)
if (packet == a_loss)
break;
}
-#endif
if (seq_loss != DCCP_MAX_SEQNO + 1)
win_loss = a_loss->ccid3hrx_win_count;