Skip to content

Commit

Permalink
bnxt_en: Don't proceed in .ndo_set_rx_mode() when device is not in op…
Browse files Browse the repository at this point in the history
…en state.

Check the BNXT_STATE_OPEN flag instead of netif_running() in
bnxt_set_rx_mode().  If the driver is going through any reset, such
as firmware reset or even TX timeout, it may not be ready to set the RX
mode and may crash.  The new rx mode settings will be picked up when
the device is opened again later.

Fixes: 230d1f0 ("bnxt_en: Handle firmware reset.")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Michael Chan authored and David S. Miller committed Sep 16, 2019
1 parent 8f7baad commit 268d089
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/net/ethernet/broadcom/bnxt/bnxt.c
Original file line number Diff line number Diff line change
Expand Up @@ -9557,14 +9557,16 @@ static bool bnxt_uc_list_updated(struct bnxt *bp)
static void bnxt_set_rx_mode(struct net_device *dev)
{
struct bnxt *bp = netdev_priv(dev);
struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
u32 mask = vnic->rx_mask;
struct bnxt_vnic_info *vnic;
bool mc_update = false;
bool uc_update;
u32 mask;

if (!netif_running(dev))
if (!test_bit(BNXT_STATE_OPEN, &bp->state))
return;

vnic = &bp->vnic_info[0];
mask = vnic->rx_mask;
mask &= ~(CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS |
CFA_L2_SET_RX_MASK_REQ_MASK_MCAST |
CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST |
Expand Down

0 comments on commit 268d089

Please sign in to comment.