summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorShailend Chand <shailend@google.com>2023-04-07 11:48:30 -0700
committerPaolo Abeni <pabeni@redhat.com>2023-04-11 15:47:14 +0200
commit4de00f0acc722f43046dca06fe1336597d1250ab (patch)
tree805faeba1acfc6e389b178a239cc1df07fab942b /drivers
parentebe3bdc4359e07b4e347af8d5324fb436302bbe1 (diff)
gve: Unify duplicate GQ min pkt desc size constants
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/google/gve/gve.h2
-rw-r--r--drivers/net/ethernet/google/gve/gve_tx.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/google/gve/gve.h
index 4d01c66d2d65..98eb78d98e9f 100644
--- a/drivers/net/ethernet/google/gve/gve.h
+++ b/drivers/net/ethernet/google/gve/gve.h
@@ -49,8 +49,6 @@
#define GVE_XDP_ACTIONS 5
-#define GVE_TX_MAX_HEADER_SIZE 182
-
#define GVE_GQ_TX_MIN_PKT_DESC_BYTES 182
/* Each slot in the desc ring has a 1:1 mapping to a slot in the data ring */
diff --git a/drivers/net/ethernet/google/gve/gve_tx.c b/drivers/net/ethernet/google/gve/gve_tx.c
index fe6b933e1df1..813da572abca 100644
--- a/drivers/net/ethernet/google/gve/gve_tx.c
+++ b/drivers/net/ethernet/google/gve/gve_tx.c
@@ -730,7 +730,7 @@ static int gve_tx_fill_xdp(struct gve_priv *priv, struct gve_tx_ring *tx,
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;
@@ -810,7 +810,7 @@ int gve_xdp_xmit_one(struct gve_priv *priv, struct gve_tx_ring *tx,
{
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, false);