diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-05 14:14:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-05 14:14:19 -0700 |
| commit | f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d (patch) | |
| tree | f8d9d8ee821fcc9f0a8e1a8679bc622219c70e3b /net/tls | |
| parent | 8f4043f1253292495dbf9c8be0c1b07b4b9902b7 (diff) | |
| parent | 7f46774c6480174eb869a3c15167eafac467a6af (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor comment merge conflict in mlx5.
Staging driver has a fixup due to the skb->xmit_more changes
in 'net-next', but was removed in 'net'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tls')
| -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 4f821edeeae6..4741edf4bb1e 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1497,6 +1497,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); |