diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/dccp/ccids/ccid2.c | 11 | ||||
-rw-r--r-- | net/dccp/ccids/ccid2.h | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index 3e4fa6b6f25..5114a2d30bf 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c | |||
@@ -179,16 +179,11 @@ static void ccid2_change_l_ack_ratio(struct sock *sk, int val) | |||
179 | dp->dccps_l_ack_ratio = val; | 179 | dp->dccps_l_ack_ratio = val; |
180 | } | 180 | } |
181 | 181 | ||
182 | static void ccid2_change_cwnd(struct ccid2_hc_tx_sock *hctx, int val) | 182 | static void ccid2_change_cwnd(struct ccid2_hc_tx_sock *hctx, u32 val) |
183 | { | 183 | { |
184 | if (val == 0) | ||
185 | val = 1; | ||
186 | |||
187 | /* XXX do we need to change ack ratio? */ | 184 | /* XXX do we need to change ack ratio? */ |
188 | ccid2_pr_debug("change cwnd to %d\n", val); | 185 | hctx->ccid2hctx_cwnd = val? : 1; |
189 | 186 | ccid2_pr_debug("changed cwnd to %u\n", hctx->ccid2hctx_cwnd); | |
190 | BUG_ON(val < 1); | ||
191 | hctx->ccid2hctx_cwnd = val; | ||
192 | } | 187 | } |
193 | 188 | ||
194 | static void ccid2_change_srtt(struct ccid2_hc_tx_sock *hctx, long val) | 189 | static void ccid2_change_srtt(struct ccid2_hc_tx_sock *hctx, long val) |
diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h index ebd79499c85..d9daa534c9b 100644 --- a/net/dccp/ccids/ccid2.h +++ b/net/dccp/ccids/ccid2.h | |||
@@ -50,7 +50,7 @@ struct ccid2_seq { | |||
50 | * @ccid2hctx_rpdupack - dupacks since rpseq | 50 | * @ccid2hctx_rpdupack - dupacks since rpseq |
51 | */ | 51 | */ |
52 | struct ccid2_hc_tx_sock { | 52 | struct ccid2_hc_tx_sock { |
53 | int ccid2hctx_cwnd; | 53 | u32 ccid2hctx_cwnd; |
54 | int ccid2hctx_ssacks; | 54 | int ccid2hctx_ssacks; |
55 | int ccid2hctx_acks; | 55 | int ccid2hctx_acks; |
56 | unsigned int ccid2hctx_ssthresh; | 56 | unsigned int ccid2hctx_ssthresh; |