Merge tag 'backlight-next-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...

[linux-2.6-microblaze.git] / net / tls / tls_sw.c

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 91d21b0..c2b5e0d 100644 (file)
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -1489,13 +1489,12 @@ static int decrypt_skb_update(struct sock *sk, struct sk_buff *skb,
        int pad, err = 0;
 
        if (!ctx->decrypted) {
-#ifdef CONFIG_TLS_DEVICE
                if (tls_ctx->rx_conf == TLS_HW) {
                        err = tls_device_decrypted(sk, skb);
                        if (err < 0)
                                return err;
                }
-#endif
+
                /* Still not decrypted after tls_device */
                if (!ctx->decrypted) {
                        err = decrypt_internal(sk, skb, dest, NULL, chunk, zc,
@@ -2014,10 +2013,9 @@ static int tls_read_size(struct strparser *strp, struct sk_buff *skb)
                ret = -EINVAL;
                goto read_failure;
        }
-#ifdef CONFIG_TLS_DEVICE
+
        tls_device_rx_resync_new_rec(strp->sk, data_len + TLS_HEADER_SIZE,
                                     TCP_SKB_CB(skb)->seq + rxm->offset);
-#endif
        return data_len + TLS_HEADER_SIZE;
 
 read_failure: