I have backported Arnaldo's changes to the test tree by inserting a
dummy patch; all the other patches have been updated relative to this.
The set of patches has been uploaded, it remains fully bisectable (just verified).
Work with regard to the more recent changes will have to be done later.
The Faster Restart tree has been updated, there were only positioning changes.
In the CCID4 tree, two new changes have been updated that were in the 2.6.25 CCID3 tree:
--- b/net/dccp/ccids/lib/tfrc_ccids.c
+++ b/net/dccp/ccids/lib/tfrc_ccids.c
@@ -37,7 +37,7 @@
{
u32 delta = ktime_us_delta(now, hctx->tfrchctx_t_last_win_count);
- return delta/hctx->tfrchctx_rtt;
+ return delta / hctx->tfrchctx_rtt;
}
EXPORT_SYMBOL_GPL(tfrc_hc_tx_idle_rtt);
--- b/net/dccp/ccids/ccid4.c
+++ b/net/dccp/ccids/ccid4.c
@@ -542,11 +542,8 @@
hctx->tfrchctx_state = TFRC_SSTATE_NO_SENT;
tfrc_tx_hist_init(&hctx->tfrchctx_hist, ccid4_tx_hist);
-
- hctx->tfrchctx_no_feedback_timer.function =
- ccid4_hc_tx_no_feedback_timer;
- hctx->tfrchctx_no_feedback_timer.data = (unsigned long)sk;
- init_timer(&hctx->tfrchctx_no_feedback_timer);
+ setup_timer(&hctx->tfrchctx_no_feedback_timer,
+ ccid4_hc_tx_no_feedback_timer, (unsigned long)sk);
return 0;
}
Please have a look at the changes - the CCID4 tree has also been
updated, compile-tested and uploaded.
-
To unsubscribe from this list: send the line "unsubscribe dccp" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
