From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 7 Jul 2022 19:07:37 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.1-rc5~731^2~182
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83ec88d81aa8762d4fb75f95365da6b73a38efe9;p=platform%2Fkernel%2Flinux-starfive.git

Merge git://git./linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

83ec88d81aa8762d4fb75f95365da6b73a38efe9
diff --cc drivers/net/can/m_can/m_can.c
index 4f90e17,7931f9c..afaaeb6
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@@ -1348,10 -1348,12 +1348,12 @@@ static void m_can_chip_config(struct ne
  	/* set bittiming params */
  	m_can_set_bittiming(dev);
  
 -	/* enable internal timestamp generation, with a prescalar of 16. The
 -	 * prescalar is applied to the nominal bit timing
 +	/* enable internal timestamp generation, with a prescaler of 16. The
 +	 * prescaler is applied to the nominal bit timing
  	 */
- 	m_can_write(cdev, M_CAN_TSCC, FIELD_PREP(TSCC_TCP_MASK, 0xf));
+ 	m_can_write(cdev, M_CAN_TSCC,
+ 		    FIELD_PREP(TSCC_TCP_MASK, 0xf) |
+ 		    FIELD_PREP(TSCC_TSS_MASK, TSCC_TSS_INTERNAL));
  
  	m_can_config_endisable(cdev, false);
  
diff --cc net/tls/tls_sw.c
index 79043bc,e30649f..f1777d6
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@@ -1593,20 -1576,16 +1590,23 @@@ static int decrypt_skb_update(struct so
  	}
  
  	err = decrypt_internal(sk, skb, dest, NULL, darg);
- 	if (err < 0)
+ 	if (err < 0) {
+ 		if (err == -EBADMSG)
+ 			TLS_INC_STATS(sock_net(sk), LINUX_MIB_TLSDECRYPTERROR);
  		return err;
+ 	}
  	if (darg->async)
  		goto decrypt_next;
 +	/* If opportunistic TLS 1.3 ZC failed retry without ZC */
 +	if (unlikely(darg->zc && prot->version == TLS_1_3_VERSION &&
 +		     darg->tail != TLS_RECORD_TYPE_DATA)) {
 +		darg->zc = false;
 +		TLS_INC_STATS(sock_net(sk), LINUX_MIN_TLSDECRYPTRETRY);
 +		return decrypt_skb_update(sk, skb, dest, darg);
 +	}
  
  decrypt_done:
 -	pad = padding_length(prot, skb);
 +	pad = tls_padding_length(prot, skb, darg);
  	if (pad < 0)
  		return pad;