diff options
| author | Michael Chan <michael.chan@broadcom.com> | 2019-09-14 00:01:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-16 16:44:27 +0200 |
| commit | 268d0895f1b9690755d91b6ced60c9d8d17a7567 (patch) | |
| tree | 81af20a67cfc88cfeace602d855cc7a16376caf8 /drivers | |
| parent | 8f7baad7f03543451af27f5380fc816b008aa1f2 (diff) | |
| download | linux-stable-268d0895f1b9690755d91b6ced60c9d8d17a7567.tar.gz linux-stable-268d0895f1b9690755d91b6ced60c9d8d17a7567.tar.bz2 linux-stable-268d0895f1b9690755d91b6ced60c9d8d17a7567.zip | |
bnxt_en: Don't proceed in .ndo_set_rx_mode() when device is not in open 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: 230d1f0de754 ("bnxt_en: Handle firmware reset.")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 402d9f50d92c..58831dd07c84 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -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 | |