diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-04-15 15:51:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-04-15 15:51:49 +1000 |
| commit | f06ddb53096b4cddad2c530125a78a3c2a1d28a4 (patch) | |
| tree | 36a05922af22272dc82357ce82be21a3a9214bd0 /net/tls/tls_sw.c | |
| parent | ecc4946f11a07884f230450a6d5a92337bc21375 (diff) | |
| parent | dc4060a5dc2557e6b5aa813bf5b73677299d62d2 (diff) | |
BackMerge v5.1-rc5 into drm-next
Need rc5 for udl fix to add udl cleanups on top.
Signed-off-by: Dave Airlie <airlied@redhat.com>
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); |