Skip to content

Commit

Permalink
bnxt: disable napi before canceling DIM
Browse files Browse the repository at this point in the history
[ Upstream commit 01cca6b ]

napi schedules DIM, napi has to be disabled first,
then DIM canceled.

Noticed while reading the code.

Fixes: 0bc0b97 ("bnxt_en: cleanup DIM work on device shutdown")
Fixes: 6a8788f ("bnxt_en: add support for software dynamic interrupt moderation")
Reviewed-by: Michael Chan <michael.chan@broadcom.com>
Reviewed-by: Edwin Peer <edwin.peer@broadcom.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
kuba-moo authored and Sasha Levin committed Aug 26, 2021
1 parent 5b24ae8 commit d913d5c
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/net/ethernet/broadcom/bnxt/bnxt.c
Expand Up @@ -8855,10 +8855,9 @@ static void bnxt_disable_napi(struct bnxt *bp)
for (i = 0; i < bp->cp_nr_rings; i++) {
struct bnxt_cp_ring_info *cpr = &bp->bnapi[i]->cp_ring;

napi_disable(&bp->bnapi[i]->napi);
if (bp->bnapi[i]->rx_ring)
cancel_work_sync(&cpr->dim.work);

napi_disable(&bp->bnapi[i]->napi);
}
}

Expand Down

0 comments on commit d913d5c

Please sign in to comment.