diff options
Diffstat (limited to 'net/dccp/ccids/ccid3.c')
-rw-r--r-- | net/dccp/ccids/ccid3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index fb500d3851c3..52a71a900eb1 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c | |||
@@ -924,6 +924,7 @@ found: | |||
924 | } | 924 | } |
925 | 925 | ||
926 | static void ccid3_hc_rx_update_li(struct sock *sk, | 926 | static void ccid3_hc_rx_update_li(struct sock *sk, |
927 | struct dccp_li_hist *li_hist, | ||
927 | struct list_head *li_hist_list, | 928 | struct list_head *li_hist_list, |
928 | struct list_head *hist_list, | 929 | struct list_head *hist_list, |
929 | struct timeval *last_feedback, | 930 | struct timeval *last_feedback, |
@@ -935,9 +936,8 @@ static void ccid3_hc_rx_update_li(struct sock *sk, | |||
935 | u64 seq_temp; | 936 | u64 seq_temp; |
936 | 937 | ||
937 | if (list_empty(li_hist_list)) { | 938 | if (list_empty(li_hist_list)) { |
938 | if (!dccp_li_hist_interval_new(ccid3_li_hist, | 939 | if (!dccp_li_hist_interval_new(li_hist, li_hist_list, |
939 | li_hist_list, seq_loss, | 940 | seq_loss, win_loss)) |
940 | win_loss)) | ||
941 | return; | 941 | return; |
942 | 942 | ||
943 | head = list_entry(li_hist_list->next, struct dccp_li_hist_entry, | 943 | head = list_entry(li_hist_list->next, struct dccp_li_hist_entry, |
@@ -960,7 +960,7 @@ static void ccid3_hc_rx_update_li(struct sock *sk, | |||
960 | /* new loss event detected */ | 960 | /* new loss event detected */ |
961 | /* calculate last interval length */ | 961 | /* calculate last interval length */ |
962 | seq_temp = dccp_delta_seqno(head->dccplih_seqno, seq_loss); | 962 | seq_temp = dccp_delta_seqno(head->dccplih_seqno, seq_loss); |
963 | entry = dccp_li_hist_entry_new(ccid3_li_hist, GFP_ATOMIC); | 963 | entry = dccp_li_hist_entry_new(li_hist, GFP_ATOMIC); |
964 | 964 | ||
965 | if (entry == NULL) { | 965 | if (entry == NULL) { |
966 | DCCP_BUG("out of memory - can not allocate entry"); | 966 | DCCP_BUG("out of memory - can not allocate entry"); |
@@ -971,7 +971,7 @@ static void ccid3_hc_rx_update_li(struct sock *sk, | |||
971 | 971 | ||
972 | tail = li_hist_list->prev; | 972 | tail = li_hist_list->prev; |
973 | list_del(tail); | 973 | list_del(tail); |
974 | kmem_cache_free(ccid3_li_hist->dccplih_slab, tail); | 974 | kmem_cache_free(li_hist->dccplih_slab, tail); |
975 | 975 | ||
976 | /* Create the newest interval */ | 976 | /* Create the newest interval */ |
977 | entry->dccplih_seqno = seq_loss; | 977 | entry->dccplih_seqno = seq_loss; |
@@ -1005,7 +1005,7 @@ static int ccid3_hc_rx_detect_loss(struct sock *sk, | |||
1005 | while (dccp_delta_seqno(hcrx->ccid3hcrx_seqno_nonloss, seqno) | 1005 | while (dccp_delta_seqno(hcrx->ccid3hcrx_seqno_nonloss, seqno) |
1006 | > TFRC_RECV_NUM_LATE_LOSS) { | 1006 | > TFRC_RECV_NUM_LATE_LOSS) { |
1007 | loss = 1; | 1007 | loss = 1; |
1008 | ccid3_hc_rx_update_li(sk, | 1008 | ccid3_hc_rx_update_li(sk, ccid3_li_hist, |
1009 | &hcrx->ccid3hcrx_li_hist, | 1009 | &hcrx->ccid3hcrx_li_hist, |
1010 | &hcrx->ccid3hcrx_hist, | 1010 | &hcrx->ccid3hcrx_hist, |
1011 | &hcrx->ccid3hcrx_tstamp_last_feedback, | 1011 | &hcrx->ccid3hcrx_tstamp_last_feedback, |