From: Shailend Chand <shailend@google.com>
Date: Fri, 7 Apr 2023 11:48:30 -0700
Subject: gve: Unify duplicate GQ min pkt desc size constants
Patch-mainline: v6.4-rc1
Git-commit: 4de00f0acc722f43046dca06fe1336597d1250ab
References: bsc#1214479
The two constants accomplish the same thing.
Signed-off-by: Shailend Chand <shailend@google.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20230407184830.309398-1-shailend@google.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/google/gve/gve.h | 2 --
drivers/net/ethernet/google/gve/gve_tx.c | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
--- a/drivers/net/ethernet/google/gve/gve.h
+++ b/drivers/net/ethernet/google/gve/gve.h
@@ -51,8 +51,6 @@
#define GVE_XDP_ACTIONS 5
-#define GVE_TX_MAX_HEADER_SIZE 182
-
/* Each slot in the desc ring has a 1:1 mapping to a slot in the data ring */
struct gve_rx_desc_queue {
struct gve_rx_desc *desc_ring; /* the descriptor ring */
--- a/drivers/net/ethernet/google/gve/gve_tx.c
+++ b/drivers/net/ethernet/google/gve/gve_tx.c
@@ -723,7 +723,7 @@ static int gve_tx_fill_xdp(struct gve_pr
u32 reqi = tx->req;
pad = gve_tx_fifo_pad_alloc_one_frag(&tx->tx_fifo, len);
- if (pad >= GVE_TX_MAX_HEADER_SIZE)
+ if (pad >= GVE_GQ_TX_MIN_PKT_DESC_BYTES)
pad = 0;
info = &tx->info[reqi & tx->mask];
info->xdp_frame = frame_p;
@@ -802,7 +802,7 @@ int gve_xdp_xmit_one(struct gve_priv *pr
{
int nsegs;
- if (!gve_can_tx(tx, len + GVE_TX_MAX_HEADER_SIZE - 1))
+ if (!gve_can_tx(tx, len + GVE_GQ_TX_MIN_PKT_DESC_BYTES - 1))
return -EBUSY;
nsegs = gve_tx_fill_xdp(priv, tx, data, len, frame_p);