diff options
author | Thomas Gleixner | 2017-06-21 09:07:52 +0200 |
---|---|---|
committer | Thomas Gleixner | 2017-06-21 09:07:52 +0200 |
commit | f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9 (patch) | |
tree | 84d3297b16fa7e373f2eabef56cd12ae5a9b8a29 /include/net | |
parent | posix-cpu-timers: Make timespec to nsec conversion safe (diff) | |
parent | Merge branch 'clockevents/4.12-fixes' of https://git.linaro.org/people/daniel... (diff) | |
download | kernel-qcow2-linux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.tar.gz kernel-qcow2-linux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.tar.xz kernel-qcow2-linux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.zip |
Merge branch 'timers/urgent' into timers/core
Pick up dependent changes.
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ipv6.h | 1 | ||||
-rw-r--r-- | include/net/tcp.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index dbf0abba33b8..3e505bbff8ca 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -1007,6 +1007,7 @@ int inet6_hash_connect(struct inet_timewait_death_row *death_row, */ extern const struct proto_ops inet6_stream_ops; extern const struct proto_ops inet6_dgram_ops; +extern const struct proto_ops inet6_sockraw_ops; struct group_source_req; struct group_filter; diff --git a/include/net/tcp.h b/include/net/tcp.h index 38a7427ae902..be6223c586fa 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -924,7 +924,7 @@ struct tcp_congestion_ops { void (*cwnd_event)(struct sock *sk, enum tcp_ca_event ev); /* call when ack arrives (optional) */ void (*in_ack_event)(struct sock *sk, u32 flags); - /* new value of cwnd after loss (optional) */ + /* new value of cwnd after loss (required) */ u32 (*undo_cwnd)(struct sock *sk); /* hook for packet ack accounting (optional) */ void (*pkts_acked)(struct sock *sk, const struct ack_sample *sample); |