Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bde21915 authored Jan 08, 2018 by David S. Miller

Merge branch 'bnxt_en_fixes'



Michael Chan says:

====================
bnxt_en: 2 small bug fixes.

The first one fixes the TC Flower flow parameter passed to firmware.  The
2nd one fixes the VF index range checking for iproute2 SRIOV related commands.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 51335502 78f30004

drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ static int bnxt_vf_ndo_prep(struct bnxt *bp, int vf_id)
		netdev_err(bp->dev, "vf ndo called though sriov is disabled\n");
		return -EINVAL;
		}
		if (vf_id >= bp->pf.max_vfs) {
		if (vf_id >= bp->pf.active_vfs) {
		netdev_err(bp->dev, "Invalid VF id %d\n", vf_id);
		return -EINVAL;
		}

drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -421,7 +421,7 @@ static int bnxt_hwrm_cfa_flow_alloc(struct bnxt bp, struct bnxt_tc_flow flow,
		}

		/* If all IP and L4 fields are wildcarded then this is an L2 flow */
		if (is_wildcard(&l3_mask, sizeof(l3_mask)) &&
		if (is_wildcard(l3_mask, sizeof(*l3_mask)) &&
		is_wildcard(&flow->l4_mask, sizeof(flow->l4_mask))) {
		flow_flags \|= CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_L2;
		} else {