import kernel-5.14.0-284.11.1.el9_2

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 96d8426c3f950f38402802ba332e28e905e95049..5ffb9b200636c0eeea61eef99250e736b9bd6e73 100644
+index 96d8426c3f950f38402802ba332e28e905e95049..754a0bff4a609ff45f978b97607c21c55fcbee95 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>
@@ -255,10 +255,11 @@ index 96d8426c3f950f38402802ba332e28e905e95049..5ffb9b200636c0eeea61eef99250e736
  #include <net/sch_generic.h>
  #include "gve.h"
  #include "gve_dqo.h"
-@@ -30,6 +32,49 @@
+@@ -29,6 +31,49 @@ #define MIN_TX_TIMEOUT_GAP (1000 * 10)
+ 
  const char gve_version_str[] = GVE_VERSION;
  static const char gve_version_prefix[] = GVE_VERSION_PREFIX;
- 
++
 +static int gve_verify_driver_compatibility(struct gve_priv *priv)
 +{
 +	int err;
@@ -301,19 +302,9 @@ index 96d8426c3f950f38402802ba332e28e905e95049..5ffb9b200636c0eeea61eef99250e736
 +			  driver_info, driver_info_bus);
 +	return err;
 +}
-+
+ 
  static netdev_tx_t gve_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
- 	struct gve_priv *priv = netdev_priv(dev);
-@@ -526,7 +571,7 @@ 			 int (*gve_poll)(struct napi_struct *, int))
- {
- 	struct gve_notify_block *block = &priv->ntfy_blocks[ntfy_idx];
- 
--	netif_napi_add(priv->dev, &block->napi, gve_poll);
-+	netif_napi_add(priv->dev, &block->napi, gve_poll, 64);
- }
- 
- static void gve_remove_napi(struct gve_priv *priv, int ntfy_idx)
 @@ -856,8 +901,7 @@ 	int num_qpls = gve_num_tx_qpls(priv) + gve_num_rx_qpls(priv);
  	int i, j;
  	int err;