dccp ccid-2: replace remaining references to local Sequence Window value This replaces the remaining references to dccps_l_seq_win with the corresponding call to retrieve the current (STABLE if not in negotiation, CHANGING if being negotiated) value of the feature-local sequence window. Signed-off-by: Gerrit Renker --- net/dccp/ccids/ccid2.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c @@ -441,10 +441,10 @@ static void ccid2_new_ack(struct sock *s { struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk); struct dccp_sock *dp = dccp_sk(sk); + u64 l_seq_win = dccp_feat_nn_get(sk, DCCPF_SEQUENCE_WINDOW); int r_seq_used = hc->tx_cwnd / dp->dccps_l_ack_ratio; - if (hc->tx_cwnd < dp->dccps_l_seq_win && - r_seq_used < dp->dccps_r_seq_win) { + if (hc->tx_cwnd < l_seq_win && r_seq_used < dp->dccps_r_seq_win) { if (hc->tx_cwnd < hc->tx_ssthresh) { if (*maxincr > 0 && ++hc->tx_packets_acked >= 2) { hc->tx_cwnd += 1; @@ -466,10 +466,10 @@ static void ccid2_new_ack(struct sock *s else if (r_seq_used * CCID2_WIN_CHANGE_FACTOR < dp->dccps_r_seq_win/2) ccid2_change_l_ack_ratio(sk, dp->dccps_l_ack_ratio / 2 ? : 1U); - if (hc->tx_cwnd * CCID2_WIN_CHANGE_FACTOR >= dp->dccps_l_seq_win) - ccid2_change_l_seq_window(sk, dp->dccps_l_seq_win * 2); - else if (hc->tx_cwnd * CCID2_WIN_CHANGE_FACTOR < dp->dccps_l_seq_win/2) - ccid2_change_l_seq_window(sk, dp->dccps_l_seq_win / 2); + if (hc->tx_cwnd * CCID2_WIN_CHANGE_FACTOR >= l_seq_win) + ccid2_change_l_seq_window(sk, l_seq_win * 2); + else if (hc->tx_cwnd * CCID2_WIN_CHANGE_FACTOR < l_seq_win / 2) + ccid2_change_l_seq_window(sk, l_seq_win / 2); /* * FIXME: RTT is sampled several times per acknowledgment (for each