import kernel-5.14.0-162.23.1.el9_1

SOURCES/4-backport-changes-from-https-kernel-googlesource-com-pub-scm-linux-kernel-git-torvalds-linux-tag-v6-2.patch

@@ -243,7 +243,7 @@ index 50b384910c8399dd9dde1a3ffe4cca8b9f078b13..ce574d097e280f9dbf52663661ebeffa
  			data[i++] = tmp_rx_skb_alloc_fail +
  				tmp_rx_buf_alloc_fail +
 diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
-index 54e51c8221b8cab1545a7cb50e93543398dbb8d6..da7058355dd381a1e1d414980638dd4186c39730 100644
+index 54e51c8221b8cab1545a7cb50e93543398dbb8d6..5ffb9b200636c0eeea61eef99250e736b9bd6e73 100644
 --- a/drivers/net/ethernet/google/gve/gve_main.c
 +++ b/drivers/net/ethernet/google/gve/gve_main.c
 @@ -12,6 +12,8 @@ #include <linux/pci.h>
@@ -273,9 +273,9 @@ index 54e51c8221b8cab1545a7cb50e93543398dbb8d6..da7058355dd381a1e1d414980638dd41
 +
 +	*driver_info = (struct gve_driver_info) {
 +		.os_type = 1, /* Linux */
-+		.os_version_major = cpu_to_be32(LINUX_VERSION_MAJOR),
-+		.os_version_minor = cpu_to_be32(LINUX_VERSION_SUBLEVEL),
-+		.os_version_sub = cpu_to_be32(LINUX_VERSION_PATCHLEVEL),
++		.os_version_major = cpu_to_be32(6),
++		.os_version_minor = cpu_to_be32(2),
++		.os_version_sub = cpu_to_be32(0),
 +		.driver_capability_flags = {
 +			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1),
 +			cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2),
@@ -1090,18 +1090,9 @@ index 8c939628e2d85dadfafdf2acb55a43f69763ed90..630f42a3037b015eda013fa3f583b0ec
  			goto error;
  		rx->ctx.skb_tail = rx->ctx.skb_head;
 diff --git a/drivers/net/ethernet/google/gve/gve_tx_dqo.c b/drivers/net/ethernet/google/gve/gve_tx_dqo.c
-index ec394d9916681ad230d42e99707ed09dc05d6154..b76143bfd594793bbdd4a5eae4aa9a7fc4632e91 100644
+index ec394d9916681ad230d42e99707ed09dc05d6154..9ae567077dac0dd1b0fa5981cab52590ee52e3c6 100644
 --- a/drivers/net/ethernet/google/gve/gve_tx_dqo.c
 +++ b/drivers/net/ethernet/google/gve/gve_tx_dqo.c
-@@ -386,7 +386,7 @@ 		csum_replace_by_diff(&tcp->check,
- 				     (__force __wsum)htonl(paylen));
- 
- 		/* Compute length of segmentation header. */
--		header_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-+		header_len = skb_tcp_all_headers(skb);
- 		break;
- 	default:
- 		return -EINVAL;
 @@ -598,9 +598,9 @@  * - If a buffer contains both header and payload, it is counted as two buffers.
   */
  static bool gve_can_send_tso(const struct sk_buff *skb)
@@ -1109,7 +1100,7 @@ index ec394d9916681ad230d42e99707ed09dc05d6154..b76143bfd594793bbdd4a5eae4aa9a7f
 -	const int header_len = skb_checksum_start_offset(skb) + tcp_hdrlen(skb);
  	const int max_bufs_per_seg = GVE_TX_MAX_DATA_DESCS - 1;
  	const struct skb_shared_info *shinfo = skb_shinfo(skb);
-+	const int header_len = skb_tcp_all_headers(skb);
++	const int header_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
  	const int gso_size = shinfo->gso_size;
  	int cur_seg_num_bufs;
  	int cur_seg_size;