diff options
author | Mark Brown <broonie@kernel.org> | 2016-02-10 18:26:26 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-02-10 18:26:26 +0000 |
commit | b388b35a17d53dac58f2391795b823b7c5a54bac (patch) | |
tree | a8db4b571297771e191489abeede06514fe94fd3 /include/net/tcp.h | |
parent | 6b4fe72f6c1ab93a893a8bc2e1155d34d7689440 (diff) | |
parent | 17aa01a7059b202f893a9e7e859032640318b458 (diff) |
Merge branch 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.02-android
Diffstat (limited to 'include/net/tcp.h')
-rw-r--r-- | include/net/tcp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index e6ec66a5fedc..d431be36263b 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1085,6 +1085,8 @@ void tcp_set_state(struct sock *sk, int state); void tcp_done(struct sock *sk); +int tcp_abort(struct sock *sk, int err); + static inline void tcp_sack_reset(struct tcp_options_received *rx_opt) { rx_opt->dsack = 0; |