diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-11-23 01:27:24 +0100 |
|---|---|---|
| committer | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-11-23 01:27:24 +0100 |
| commit | a9f852e92e40992c4ff09ac3940f7725e016317a (patch) | |
| tree | e6c40313de08cfb69b806a44dd777432d2b9ef29 /include/net/tls.h | |
| parent | net: dsa: ocelot: fix "should it be static?" warnings (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-a9f852e92e40992c4ff09ac3940f7725e016317a.tar.xz linux-a9f852e92e40992c4ff09ac3940f7725e016317a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in drivers/s390/net/qeth_l2_main.c, kept the lock
from commit c8183f548902 ("s390/qeth: fix potential deadlock on
workqueue flush"), removed the code which was removed by commit
9897d583b015 ("s390/qeth: consolidate some duplicated HW cmd code").
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Diffstat (limited to 'include/net/tls.h')
| -rw-r--r-- | include/net/tls.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/tls.h b/include/net/tls.h index e6becd6218a3..6ed91e82edd0 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -337,6 +337,8 @@ int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx, int tx); void tls_sw_strparser_arm(struct sock *sk, struct tls_context *ctx); void tls_sw_strparser_done(struct tls_context *tls_ctx); int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size); +int tls_sw_sendpage_locked(struct sock *sk, struct page *page, + int offset, size_t size, int flags); int tls_sw_sendpage(struct sock *sk, struct page *page, int offset, size_t size, int flags); void tls_sw_cancel_work_tx(struct tls_context *tls_ctx); |