aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ccids/ccid3.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/ccids/ccid3.c')
-rw-r--r--net/dccp/ccids/ccid3.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 5c452a3ec4d1..5361a4d8e13b 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -284,7 +284,7 @@ static void ccid3_hc_tx_no_feedback_timer(unsigned long data)
284 284
285restart_timer: 285restart_timer:
286 sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer, 286 sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer,
287 jiffies + usecs_to_jiffies(t_nfb)); 287 jiffies + usecs_to_jiffies(t_nfb));
288out: 288out:
289 bh_unlock_sock(sk); 289 bh_unlock_sock(sk);
290 sock_put(sk); 290 sock_put(sk);
@@ -319,7 +319,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
319 case TFRC_SSTATE_NO_SENT: 319 case TFRC_SSTATE_NO_SENT:
320 sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer, 320 sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer,
321 (jiffies + 321 (jiffies +
322 usecs_to_jiffies(TFRC_INITIAL_TIMEOUT))); 322 usecs_to_jiffies(TFRC_INITIAL_TIMEOUT)));
323 hctx->ccid3hctx_last_win_count = 0; 323 hctx->ccid3hctx_last_win_count = 0;
324 hctx->ccid3hctx_t_last_win_count = now; 324 hctx->ccid3hctx_t_last_win_count = now;
325 ccid3_hc_tx_set_state(sk, TFRC_SSTATE_NO_FBACK); 325 ccid3_hc_tx_set_state(sk, TFRC_SSTATE_NO_FBACK);
@@ -487,7 +487,7 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
487 ccid3_hc_tx_set_state(sk, TFRC_SSTATE_FBACK); 487 ccid3_hc_tx_set_state(sk, TFRC_SSTATE_FBACK);
488 } else { 488 } else {
489 hctx->ccid3hctx_rtt = (9 * hctx->ccid3hctx_rtt + 489 hctx->ccid3hctx_rtt = (9 * hctx->ccid3hctx_rtt +
490 (u32)r_sample) / 10; 490 (u32)r_sample) / 10;
491 491
492 /* Update sending rate (step 4 of [RFC 3448, 4.3]) */ 492 /* Update sending rate (step 4 of [RFC 3448, 4.3]) */
493 if (hctx->ccid3hctx_p > 0) 493 if (hctx->ccid3hctx_p > 0)
@@ -924,7 +924,7 @@ static void ccid3_hc_rx_update_li(struct sock *sk, u64 seq_loss, u8 win_loss)
924} 924}
925 925
926static int ccid3_hc_rx_detect_loss(struct sock *sk, 926static int ccid3_hc_rx_detect_loss(struct sock *sk,
927 struct dccp_rx_hist_entry *packet) 927 struct dccp_rx_hist_entry *packet)
928{ 928{
929 struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk); 929 struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);
930 struct dccp_rx_hist_entry *rx_hist = 930 struct dccp_rx_hist_entry *rx_hist =
@@ -1074,7 +1074,7 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)
1074 dccp_role(sk), sk, dccp_state_name(sk->sk_state)); 1074 dccp_role(sk), sk, dccp_state_name(sk->sk_state));
1075 1075
1076 p_prev = hcrx->ccid3hcrx_p; 1076 p_prev = hcrx->ccid3hcrx_p;
1077 1077
1078 /* Calculate loss event rate */ 1078 /* Calculate loss event rate */
1079 if (!list_empty(&hcrx->ccid3hcrx_li_hist)) { 1079 if (!list_empty(&hcrx->ccid3hcrx_li_hist)) {
1080 u32 i_mean = dccp_li_hist_calc_i_mean(&hcrx->ccid3hcrx_li_hist); 1080 u32 i_mean = dccp_li_hist_calc_i_mean(&hcrx->ccid3hcrx_li_hist);
@@ -1156,7 +1156,7 @@ static int ccid3_hc_rx_getsockopt(struct sock *sk, const int optname, int len,
1156{ 1156{
1157 const struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk); 1157 const struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);
1158 const void *val; 1158 const void *val;
1159 1159
1160 /* Listen socks doesn't have a private CCID block */ 1160 /* Listen socks doesn't have a private CCID block */
1161 if (sk->sk_state == DCCP_LISTEN) 1161 if (sk->sk_state == DCCP_LISTEN)
1162 return -EINVAL; 1162 return -EINVAL;
@@ -1183,7 +1183,7 @@ static int ccid3_hc_tx_getsockopt(struct sock *sk, const int optname, int len,
1183{ 1183{
1184 const struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk); 1184 const struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
1185 const void *val; 1185 const void *val;
1186 1186
1187 /* Listen socks doesn't have a private CCID block */ 1187 /* Listen socks doesn't have a private CCID block */
1188 if (sk->sk_state == DCCP_LISTEN) 1188 if (sk->sk_state == DCCP_LISTEN)
1189 return -EINVAL; 1189 return -EINVAL;