diff options
author | Kees Cook <keescook@chromium.org> | 2017-10-24 01:46:09 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-10-25 12:59:19 +0900 |
commit | 839a6094140ade97ccc548fcd63179506c5d7fe4 (patch) | |
tree | e9b9d6ee85cdcabe72ef234230ae615ec80d84a4 /net/dccp/ccids/ccid2.h | |
parent | net: ethernet/sfc: Convert timers to use timer_setup() (diff) | |
download | linux-dev-839a6094140ade97ccc548fcd63179506c5d7fe4.tar.xz linux-dev-839a6094140ade97ccc548fcd63179506c5d7fe4.zip |
net: dccp: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly. Adds a pointer back to the sock.
Cc: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Soheil Hassas Yeganeh <soheil@google.com>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Cc: Eric Dumazet <edumazet@google.com>
Cc: dccp@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ccids/ccid2.h')
-rw-r--r-- | net/dccp/ccids/ccid2.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h index 6e50ef2898fb..1af0116dc6ce 100644 --- a/net/dccp/ccids/ccid2.h +++ b/net/dccp/ccids/ccid2.h @@ -85,6 +85,7 @@ struct ccid2_hc_tx_sock { tx_rto; u64 tx_rtt_seq:48; struct timer_list tx_rtotimer; + struct sock *sk; /* Congestion Window validation (optional, RFC 2861) */ u32 tx_cwnd_used, |