bnxt, qede and bnx2x clear NETIF_F_GRO_HW whenever NETIF_F_GRO is off. Nothing in the stack needs that. HW-GRO'd skbs arrive already coalesced with gso_size set, exactly like LRO frames, and LRO never depended on the software GRO bit. netif_elide_gro() only gates the software path, and the in-driver consumers of the offload key off the feature bit itself, not off NETIF_F_GRO. The coupling gets in the way of exercising the offload on its own: turning SW GRO off to isolate HW GRO takes HW GRO down with it on these three drivers, which is why the GRO selftests carry a generic XDP hack. The core only ever constrained GRO_HW on RXCSUM, RXFCS and LRO, and the other HW-GRO capable drivers do not couple the two either. User visible change: "ethtool -K $dev gro off" no longer implies "rx-gro-hw off" on bnxt, qede and bnx2x. Signed-off-by: Jakub Kicinski --- v2: no change v1: https://lore.kernel.org/20261118232315.3593731-2-kuba@kernel.org --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 --- drivers/net/ethernet/qlogic/qede/qede_filter.c | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index 6fb0619731ae..5686c4ecb944 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -4934,7 +4934,7 @@ netdev_features_t bnx2x_fix_features(struct net_device *dev, if (!(features & NETIF_F_RXCSUM)) features &= ~NETIF_F_LRO; - if (!(features & NETIF_F_GRO) || !bnx2x_mtu_allows_gro(dev->mtu)) + if (!bnx2x_mtu_allows_gro(dev->mtu)) features &= ~NETIF_F_GRO_HW; if (features & NETIF_F_GRO_HW) features &= ~NETIF_F_LRO; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 5c6c2219a481..ca7cb573d63c 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -14108,9 +14108,6 @@ static netdev_features_t bnxt_fix_features(struct net_device *dev, if ((bp->flags & BNXT_FLAG_NO_AGG_RINGS) || bp->xdp_prog) features &= ~(NETIF_F_LRO | NETIF_F_GRO_HW); - if (!(features & NETIF_F_GRO)) - features &= ~NETIF_F_GRO_HW; - if (features & NETIF_F_GRO_HW) features &= ~NETIF_F_LRO; diff --git a/drivers/net/ethernet/qlogic/qede/qede_filter.c b/drivers/net/ethernet/qlogic/qede/qede_filter.c index 5bf32f1034e0..d0e203167e35 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_filter.c +++ b/drivers/net/ethernet/qlogic/qede/qede_filter.c @@ -915,8 +915,7 @@ netdev_features_t qede_fix_features(struct net_device *dev, { struct qede_dev *edev = netdev_priv(dev); - if (edev->xdp_prog || edev->ndev->mtu > PAGE_SIZE || - !(features & NETIF_F_GRO)) + if (edev->xdp_prog || edev->ndev->mtu > PAGE_SIZE) features &= ~NETIF_F_GRO_HW; return features; -- 2.56.1