提交 832e3ca6 编写于 作者: I Ian McDonald 提交者: David S. Miller

[DCCP] ccid3: return value in ccid3_hc_rx_calc_first_li

In a recent patch we introduced invalid return codes which will result in the
opposite of what is intended (i.e. send more packets in face of peculiar
network conditions).

This fixes it by returning ~0 which means not calculated as per
dccp_li_hist_calc_i_mean.
Signed-off-by: NIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: NArnaldo Carvalho de Melo <acme@mandriva.com>
上级 e1b4b9f3
...@@ -845,8 +845,8 @@ static u32 ccid3_hc_rx_calc_first_li(struct sock *sk) ...@@ -845,8 +845,8 @@ static u32 ccid3_hc_rx_calc_first_li(struct sock *sk)
* Find some p such that f(p) = fval; return 1/p [RFC 3448, 6.3.1]. * Find some p such that f(p) = fval; return 1/p [RFC 3448, 6.3.1].
*/ */
if (rtt == 0) { /* would result in divide-by-zero */ if (rtt == 0) { /* would result in divide-by-zero */
DCCP_WARN("RTT==0, returning 1/p = 1\n"); DCCP_WARN("RTT==0\n");
return 1000000; return ~0;
} }
dccp_timestamp(sk, &tstamp); dccp_timestamp(sk, &tstamp);
...@@ -858,7 +858,7 @@ static u32 ccid3_hc_rx_calc_first_li(struct sock *sk) ...@@ -858,7 +858,7 @@ static u32 ccid3_hc_rx_calc_first_li(struct sock *sk)
DCCP_WARN("X_recv==0\n"); DCCP_WARN("X_recv==0\n");
if ((x_recv = hcrx->ccid3hcrx_x_recv) == 0) { if ((x_recv = hcrx->ccid3hcrx_x_recv) == 0) {
DCCP_BUG("stored value of X_recv is zero"); DCCP_BUG("stored value of X_recv is zero");
return 1000000; return ~0;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册