diff options
author | Joerg Roedel <jroedel@suse.de> | 2019-04-11 17:15:35 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2019-04-11 17:15:35 +0200 |
commit | 2b899390fdc8b8bdb95ce24269a799194b303388 (patch) | |
tree | ee02a7ae5b0f94029c5594573ae4aa97944a2c0c /net/tls/tls_sw.c | |
parent | 5aba6c47401d14247a44c3ae94d1bdab5653f692 (diff) | |
parent | 26b25a2b98e45aeb40eedcedc586ad5034cbd984 (diff) | |
download | linux-stable-2b899390fdc8b8bdb95ce24269a799194b303388.tar.gz linux-stable-2b899390fdc8b8bdb95ce24269a799194b303388.tar.bz2 linux-stable-2b899390fdc8b8bdb95ce24269a799194b303388.zip |
Merge branch 'api-features' into x86/vt-d
Diffstat (limited to 'net/tls/tls_sw.c')
-rw-r--r-- | net/tls/tls_sw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 425351ac2a9b..20b191227969 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1484,6 +1484,8 @@ static int decrypt_skb_update(struct sock *sk, struct sk_buff *skb, return err; } + } else { + *zc = false; } rxm->full_len -= padding_length(ctx, tls_ctx, skb); |