aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ccids/lib/loss_interval.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/ccids/lib/loss_interval.c')
-rw-r--r--net/dccp/ccids/lib/loss_interval.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c
index f2ca4eb74ddb..a5f59af8df43 100644
--- a/net/dccp/ccids/lib/loss_interval.c
+++ b/net/dccp/ccids/lib/loss_interval.c
@@ -129,7 +129,7 @@ static u32 dccp_li_calc_first_li(struct sock *sk,
129 u16 s, u32 bytes_recv, 129 u16 s, u32 bytes_recv,
130 u32 previous_x_recv) 130 u32 previous_x_recv)
131{ 131{
132 struct dccp_rx_hist_entry *entry, *next, *tail = NULL; 132 struct tfrc_rx_hist_entry *entry, *next, *tail = NULL;
133 u32 x_recv, p; 133 u32 x_recv, p;
134 suseconds_t rtt, delta; 134 suseconds_t rtt, delta;
135 ktime_t tstamp = ktime_set(0, 0); 135 ktime_t tstamp = ktime_set(0, 0);
@@ -138,18 +138,18 @@ static u32 dccp_li_calc_first_li(struct sock *sk,
138 int step = 0; 138 int step = 0;
139 u64 fval; 139 u64 fval;
140 140
141 list_for_each_entry_safe(entry, next, hist_list, dccphrx_node) { 141 list_for_each_entry_safe(entry, next, hist_list, tfrchrx_node) {
142 if (dccp_rx_hist_entry_data_packet(entry)) { 142 if (tfrc_rx_hist_entry_data_packet(entry)) {
143 tail = entry; 143 tail = entry;
144 144
145 switch (step) { 145 switch (step) {
146 case 0: 146 case 0:
147 tstamp = entry->dccphrx_tstamp; 147 tstamp = entry->tfrchrx_tstamp;
148 win_count = entry->dccphrx_ccval; 148 win_count = entry->tfrchrx_ccval;
149 step = 1; 149 step = 1;
150 break; 150 break;
151 case 1: 151 case 1:
152 interval = win_count - entry->dccphrx_ccval; 152 interval = win_count - entry->tfrchrx_ccval;
153 if (interval < 0) 153 if (interval < 0)
154 interval += TFRC_WIN_COUNT_LIMIT; 154 interval += TFRC_WIN_COUNT_LIMIT;
155 if (interval > 4) 155 if (interval > 4)
@@ -176,7 +176,7 @@ found:
176 return ~0; 176 return ~0;
177 } 177 }
178 178
179 delta = ktime_us_delta(tstamp, tail->dccphrx_tstamp); 179 delta = ktime_us_delta(tstamp, tail->tfrchrx_tstamp);
180 DCCP_BUG_ON(delta < 0); 180 DCCP_BUG_ON(delta < 0);
181 181
182 rtt = delta * 4 / interval; 182 rtt = delta * 4 / interval;