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

Commit 7d2837dd authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Setup multicast properly after resetting device. 



The multicast/all-multicast internal flags are not properly restored
after device reset.  This could lead to unreliable multicast operations
after an ethtool configuration change for example.

Call bnxt_mc_list_updated() and setup the vnic->mask in bnxt_init_chip()
to fix the issue.

Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 67a95e20

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

+15 −4
Original line number Original line Diff line number Diff line
@@ -4042,9 +4042,11 @@ static int bnxt_alloc_rfs_vnics(struct bnxt *bp) 
}

}





static int bnxt_cfg_rx_mode(struct bnxt *);

static int bnxt_cfg_rx_mode(struct bnxt *);

static bool bnxt_mc_list_updated(struct bnxt *, u32 *);





static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)

static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)

{

{

	struct bnxt_vnic_info *vnic = &bp->vnic_info[0];

	int rc = 0;

	int rc = 0;





	if (irq_re_init) {

	if (irq_re_init) {
@@ -4100,13 +4102,22 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init) 
		netdev_err(bp->dev, "HWRM vnic filter failure rc: %x\n", rc);

		netdev_err(bp->dev, "HWRM vnic filter failure rc: %x\n", rc);

		goto err_out;

		goto err_out;

	}

	}

	bp->vnic_info[0].uc_filter_count = 1;

	vnic->uc_filter_count = 1;





	bp->vnic_info[0].rx_mask = CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;

	vnic->rx_mask = CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;





	if ((bp->dev->flags & IFF_PROMISC) && BNXT_PF(bp))

	if ((bp->dev->flags & IFF_PROMISC) && BNXT_PF(bp))

		bp->vnic_info[0].rx_mask |=

		vnic->rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;

				CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;



	if (bp->dev->flags & IFF_ALLMULTI) {

		vnic->rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;

		vnic->mc_list_count = 0;

	} else {

		u32 mask = 0;



		bnxt_mc_list_updated(bp, &mask);

		vnic->rx_mask |= mask;

	}





	rc = bnxt_cfg_rx_mode(bp);

	rc = bnxt_cfg_rx_mode(bp);

	if (rc)

	if (rc)