Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 58913
b: refs/heads/master
c: 878ac60
h: refs/heads/master
i:
  58911: e93165e
v: v3
  • Loading branch information
Arnaldo Carvalho de Melo authored and David S. Miller committed Jul 11, 2007
1 parent 9f98507 commit 560b836
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d83258a3da1d3c7ae7b75549c8bf7ed689562c62
refs/heads/master: 878ac60023c4ba11a7fbf0b1dfe07b8472c0d6ce
12 changes: 6 additions & 6 deletions trunk/net/dccp/ccids/ccid3.c
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,7 @@ static u32 ccid3_hc_rx_calc_first_li(struct sock *sk,
}

static void ccid3_hc_rx_update_li(struct sock *sk,
struct dccp_li_hist *li_hist,
struct list_head *li_hist_list,
struct list_head *hist_list,
struct timeval *last_feedback,
Expand All @@ -935,9 +936,8 @@ static void ccid3_hc_rx_update_li(struct sock *sk,
u64 seq_temp;

if (list_empty(li_hist_list)) {
if (!dccp_li_hist_interval_new(ccid3_li_hist,
li_hist_list, seq_loss,
win_loss))
if (!dccp_li_hist_interval_new(li_hist, li_hist_list,
seq_loss, win_loss))
return;

head = list_entry(li_hist_list->next, struct dccp_li_hist_entry,
Expand All @@ -960,7 +960,7 @@ static void ccid3_hc_rx_update_li(struct sock *sk,
/* new loss event detected */
/* calculate last interval length */
seq_temp = dccp_delta_seqno(head->dccplih_seqno, seq_loss);
entry = dccp_li_hist_entry_new(ccid3_li_hist, GFP_ATOMIC);
entry = dccp_li_hist_entry_new(li_hist, GFP_ATOMIC);

if (entry == NULL) {
DCCP_BUG("out of memory - can not allocate entry");
Expand All @@ -971,7 +971,7 @@ static void ccid3_hc_rx_update_li(struct sock *sk,

tail = li_hist_list->prev;
list_del(tail);
kmem_cache_free(ccid3_li_hist->dccplih_slab, tail);
kmem_cache_free(li_hist->dccplih_slab, tail);

/* Create the newest interval */
entry->dccplih_seqno = seq_loss;
Expand Down Expand Up @@ -1005,7 +1005,7 @@ static int ccid3_hc_rx_detect_loss(struct sock *sk,
while (dccp_delta_seqno(hcrx->ccid3hcrx_seqno_nonloss, seqno)
> TFRC_RECV_NUM_LATE_LOSS) {
loss = 1;
ccid3_hc_rx_update_li(sk,
ccid3_hc_rx_update_li(sk, ccid3_li_hist,
&hcrx->ccid3hcrx_li_hist,
&hcrx->ccid3hcrx_hist,
&hcrx->ccid3hcrx_tstamp_last_feedback,
Expand Down

0 comments on commit 560b836

Please sign in to comment.