bnxt_en: Use VLAN_ETH_HLEN when possible

Replace ETH_HLEN + VLAN_HLEN with VLAN_ETH_HLEN.  Cosmetic change and
no functional changes intended.

Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Link: https://patch.msgid.link/20250917040839.1924698-9-michael.chan@broadcom.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 4ffc4632991bfb714d5138e4c79d4ae64f5a53de..c49a4755a94d0b43c1d190465751d8cb2d9a1f2a 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -6838,7 +6838,7 @@ int bnxt_hwrm_vnic_cfg(struct bnxt *bp, struct bnxt_vnic_info *vnic)
        req->dflt_ring_grp = cpu_to_le16(bp->grp_info[grp_idx].fw_grp_id);
        req->lb_rule = cpu_to_le16(0xffff);
 vnic_mru:
-       vnic->mru = bp->dev->mtu + ETH_HLEN + VLAN_HLEN;
+       vnic->mru = bp->dev->mtu + VLAN_ETH_HLEN;
        req->mru = cpu_to_le16(vnic->mru);
 
        req->vnic_id = cpu_to_le16(vnic->fw_vnic_id);
@@ -16086,7 +16086,7 @@ static int bnxt_queue_start(struct net_device *dev, void *qmem, int idx)
        napi_enable_locked(&bnapi->napi);
        bnxt_db_nq_arm(bp, &cpr->cp_db, cpr->cp_raw_cons);
 
-       mru = bp->dev->mtu + ETH_HLEN + VLAN_HLEN;
+       mru = bp->dev->mtu + VLAN_ETH_HLEN;
        for (i = 0; i < bp->nr_vnics; i++) {
                vnic = &bp->vnic_info[i];
 

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
index 1d8df44c3f9eb9dfc740ca1dd803b96f874d0f49..80fed2c07b9e8484c8499189fe937610c953a482 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -741,7 +741,7 @@ static int bnxt_hwrm_func_cfg(struct bnxt *bp, int num_vfs)
                                   FUNC_CFG_REQ_ENABLES_NUM_VNICS |
                                   FUNC_CFG_REQ_ENABLES_NUM_HW_RING_GRPS);
 
-       mtu = bp->dev->mtu + ETH_HLEN + VLAN_HLEN;
+       mtu = bp->dev->mtu + VLAN_ETH_HLEN;
        req->mru = cpu_to_le16(mtu);
        req->admin_mtu = cpu_to_le16(mtu);