65 lines
2.3 KiB
Diff
65 lines
2.3 KiB
Diff
|
From b83e8fbcd577b06391823a5f900f828f5e4e0d29 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||
|
|
Date: Tue, 2 May 2023 13:47:05 +0200
|
||
|
|
Subject: [PATCH] Apply GCP related changes
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/google/Kconfig | 2 +-
|
||
|
|
drivers/net/ethernet/google/gve/gve_main.c | 6 ++----
|
||
|
|
drivers/net/ethernet/google/gve/gve_rx.c | 2 +-
|
||
|
|
3 files changed, 4 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/google/Kconfig b/drivers/net/ethernet/google/Kconfig
|
||
|
|
index 8641a00f8..b8f04d052 100644
|
||
|
|
--- a/drivers/net/ethernet/google/Kconfig
|
||
|
|
+++ b/drivers/net/ethernet/google/Kconfig
|
||
|
|
@@ -17,7 +17,7 @@ if NET_VENDOR_GOOGLE
|
||
|
|
|
||
|
|
config GVE
|
||
|
|
tristate "Google Virtual NIC (gVNIC) support"
|
||
|
|
- depends on (PCI_MSI && (X86 || CPU_LITTLE_ENDIAN))
|
||
|
|
+ depends on PCI_MSI
|
||
|
|
help
|
||
|
|
This driver supports Google Virtual NIC (gVNIC)"
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
|
||
|
|
index 54e51c822..6cafee55e 100644
|
||
|
|
--- a/drivers/net/ethernet/google/gve/gve_main.c
|
||
|
|
+++ b/drivers/net/ethernet/google/gve/gve_main.c
|
||
|
|
@@ -857,8 +857,7 @@ static int gve_alloc_qpls(struct gve_priv *priv)
|
||
|
|
int i, j;
|
||
|
|
int err;
|
||
|
|
|
||
|
|
- /* Raw addressing means no QPLs */
|
||
|
|
- if (priv->queue_format == GVE_GQI_RDA_FORMAT)
|
||
|
|
+ if (num_qpls == 0)
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
priv->qpls = kvcalloc(num_qpls, sizeof(*priv->qpls), GFP_KERNEL);
|
||
|
|
@@ -901,8 +900,7 @@ static void gve_free_qpls(struct gve_priv *priv)
|
||
|
|
int num_qpls = gve_num_tx_qpls(priv) + gve_num_rx_qpls(priv);
|
||
|
|
int i;
|
||
|
|
|
||
|
|
- /* Raw addressing means no QPLs */
|
||
|
|
- if (priv->queue_format == GVE_GQI_RDA_FORMAT)
|
||
|
|
+ if (num_qpls == 0)
|
||
|
|
return;
|
||
|
|
|
||
|
|
kvfree(priv->qpl_cfg.qpl_id_map);
|
||
|
|
diff --git a/drivers/net/ethernet/google/gve/gve_rx.c b/drivers/net/ethernet/google/gve/gve_rx.c
|
||
|
|
index e4e98aa77..021bbf308 100644
|
||
|
|
--- a/drivers/net/ethernet/google/gve/gve_rx.c
|
||
|
|
+++ b/drivers/net/ethernet/google/gve/gve_rx.c
|
||
|
|
@@ -439,7 +439,7 @@ static bool gve_rx_ctx_init(struct gve_rx_ctx *ctx, struct gve_rx_ring *rx)
|
||
|
|
if (frag_size > rx->packet_buffer_size) {
|
||
|
|
packet_size_error = true;
|
||
|
|
netdev_warn(priv->dev,
|
||
|
|
- "RX fragment error: packet_buffer_size=%d, frag_size=%d, droping packet.",
|
||
|
|
+ "RX fragment error: packet_buffer_size=%d, frag_size=%d, dropping packet.",
|
||
|
|
rx->packet_buffer_size, be16_to_cpu(desc->len));
|
||
|
|
}
|
||
|
|
page_info = &rx->data.page_info[idx];
|
||
|
|
--
|
||
|
|
2.39.2
|
||
|
|
|